From 6bb076355db1eafdf610c96735cfc72d0dac1862 Mon Sep 17 00:00:00 2001 From: Thomas Wiest Date: Mon, 16 Mar 2015 16:48:41 -0400 Subject: Initialized to use tito. --- bin/openshift-ansible-cmds.spec | 34 ++++++++++++++++++++++++++++++++++ rel-eng/packages/.readme | 3 +++ rel-eng/tito.props | 5 +++++ 3 files changed, 42 insertions(+) create mode 100644 bin/openshift-ansible-cmds.spec create mode 100644 rel-eng/packages/.readme create mode 100644 rel-eng/tito.props diff --git a/bin/openshift-ansible-cmds.spec b/bin/openshift-ansible-cmds.spec new file mode 100644 index 000000000..24705ae31 --- /dev/null +++ b/bin/openshift-ansible-cmds.spec @@ -0,0 +1,34 @@ +Summary: OpenShift Operations files for mirror +Name: openshift-ansible-cmds +Version: 0.0.0 +Release: 1%{?dist} +License: ASL 2.0 +URL: https://github.com/openshift/openshift-ansible +Source0: %{name}-%{version}.tar.gz +Requires: python2 +BuildRequires: python2-devel +BuildArch: noarch + +%description +Scripts to make it nicer when working with hosts that are defined only by metadata. + +%prep +%setup -q + +%build + +%install +mkdir -p %{buildroot}/usr/bin +mkdir -p %{buildroot}%{python_sitelib}/openshift_ansible +mkdir -p %{buildroot}/etc/bash_completion.d + +cp -p ossh oscp opssh %{buildroot}/usr/bin +cp -p awsutil.py %{buildroot}%{python_sitelib}/openshift_ansible +cp -p ossh_bash_completion %{buildroot}/etc/bash_completion.d + +%files +/usr/bin/* +%{python_sitelib}/openshift_ansible/* +/etc/bash_completion.d/* + +%changelog diff --git a/rel-eng/packages/.readme b/rel-eng/packages/.readme new file mode 100644 index 000000000..8999c8dbc --- /dev/null +++ b/rel-eng/packages/.readme @@ -0,0 +1,3 @@ +the rel-eng/packages directory contains metadata files +named after their packages. Each file has the latest tagged +version and the project's relative directory. diff --git a/rel-eng/tito.props b/rel-eng/tito.props new file mode 100644 index 000000000..eab3f190d --- /dev/null +++ b/rel-eng/tito.props @@ -0,0 +1,5 @@ +[buildconfig] +builder = tito.builder.Builder +tagger = tito.tagger.VersionTagger +changelog_do_not_remove_cherrypick = 0 +changelog_format = %s (%ae) -- cgit v1.2.3 From 17c69ff4a4b8b905e2db4dac6c9c0e8d1212b23f Mon Sep 17 00:00:00 2001 From: Thomas Wiest Date: Mon, 16 Mar 2015 16:50:02 -0400 Subject: Automatic commit of package [openshift-ansible-cmds] release [0.0.1-1]. --- bin/README_BUILD | 4 ++++ bin/openshift-ansible-bin.spec | 34 ++++++++++++++++++++++++++++++++++ bin/openshift-ansible-cmds.spec | 34 ---------------------------------- 3 files changed, 38 insertions(+), 34 deletions(-) create mode 100644 bin/README_BUILD create mode 100644 bin/openshift-ansible-bin.spec delete mode 100644 bin/openshift-ansible-cmds.spec diff --git a/bin/README_BUILD b/bin/README_BUILD new file mode 100644 index 000000000..48d4ff4b3 --- /dev/null +++ b/bin/README_BUILD @@ -0,0 +1,4 @@ +# How to build openshift-ansible + + +Test build diff --git a/bin/openshift-ansible-bin.spec b/bin/openshift-ansible-bin.spec new file mode 100644 index 000000000..2b83a7d0b --- /dev/null +++ b/bin/openshift-ansible-bin.spec @@ -0,0 +1,34 @@ +Summary: OpenShift Operations files for mirror +Name: openshift-ansible-bin +Version: 0.0.1 +Release: 1%{?dist} +License: ASL 2.0 +URL: https://github.com/openshift/openshift-ansible +Source0: %{name}-%{version}.tar.gz +Requires: python2 +BuildRequires: python2-devel +BuildArch: noarch + +%description +Scripts to make it nicer when working with hosts that are defined only by metadata. + +%prep +%setup -q + +%build + +%install +mkdir -p %{buildroot}/usr/bin +mkdir -p %{buildroot}%{python_sitelib}/openshift_ansible +mkdir -p %{buildroot}/etc/bash_completion.d + +cp -p ossh oscp opssh %{buildroot}/usr/bin +cp -p awsutil.py %{buildroot}%{python_sitelib}/openshift_ansible +cp -p ossh_bash_completion %{buildroot}/etc/bash_completion.d + +%files +/usr/bin/* +%{python_sitelib}/openshift_ansible/* +/etc/bash_completion.d/* + +%changelog diff --git a/bin/openshift-ansible-cmds.spec b/bin/openshift-ansible-cmds.spec deleted file mode 100644 index 24705ae31..000000000 --- a/bin/openshift-ansible-cmds.spec +++ /dev/null @@ -1,34 +0,0 @@ -Summary: OpenShift Operations files for mirror -Name: openshift-ansible-cmds -Version: 0.0.0 -Release: 1%{?dist} -License: ASL 2.0 -URL: https://github.com/openshift/openshift-ansible -Source0: %{name}-%{version}.tar.gz -Requires: python2 -BuildRequires: python2-devel -BuildArch: noarch - -%description -Scripts to make it nicer when working with hosts that are defined only by metadata. - -%prep -%setup -q - -%build - -%install -mkdir -p %{buildroot}/usr/bin -mkdir -p %{buildroot}%{python_sitelib}/openshift_ansible -mkdir -p %{buildroot}/etc/bash_completion.d - -cp -p ossh oscp opssh %{buildroot}/usr/bin -cp -p awsutil.py %{buildroot}%{python_sitelib}/openshift_ansible -cp -p ossh_bash_completion %{buildroot}/etc/bash_completion.d - -%files -/usr/bin/* -%{python_sitelib}/openshift_ansible/* -/etc/bash_completion.d/* - -%changelog -- cgit v1.2.3 From a7e3b2363935fc090ce7a41853ba27ba0050dc23 Mon Sep 17 00:00:00 2001 From: Thomas Wiest Date: Tue, 24 Mar 2015 11:36:30 -0400 Subject: Automatic commit of package [openshift-ansible-bin] release [0.0.1-1]. --- bin/README_BUILD | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/bin/README_BUILD b/bin/README_BUILD index 48d4ff4b3..50010e562 100644 --- a/bin/README_BUILD +++ b/bin/README_BUILD @@ -1,4 +1,25 @@ -# How to build openshift-ansible +# openshift-ansible-bin RPM Build instructions +We use tito to make building and tracking revisions easy. +For more information on tito, please see the [Tito home page](http://rm-rf.ca/tito "Tito home page"). -Test build + +## Build a test package (no tagging needed) +``` +tito build --test --rpm +``` + + +## Tag a new build (bumps version number and adds log entries) +``` +tito tag +``` + +Follow the on screen tito instructions. + + + +## Build a new package based on the latest tag information +``` +tito build --rpm +``` -- cgit v1.2.3 From 96729907e131f0cef6f37bcca062e9b092e67d29 Mon Sep 17 00:00:00 2001 From: Thomas Wiest Date: Tue, 24 Mar 2015 13:15:53 -0400 Subject: Added spec files and tito configs. --- BUILD.md | 44 ++++++++++++++++++++++++++++++ README.md | 3 ++ bin/README_BUILD | 25 ----------------- bin/openshift-ansible-bin.spec | 14 +++++----- inventory/openshift-ansible-inventory.spec | 37 +++++++++++++++++++++++++ 5 files changed, 91 insertions(+), 32 deletions(-) create mode 100644 BUILD.md delete mode 100644 bin/README_BUILD create mode 100644 inventory/openshift-ansible-inventory.spec diff --git a/BUILD.md b/BUILD.md new file mode 100644 index 000000000..0016c96a5 --- /dev/null +++ b/BUILD.md @@ -0,0 +1,44 @@ +# openshift-ansible RPM Build instructions +We use tito to make building and tracking revisions easy. + +For more information on tito, please see the [Tito home page](http://rm-rf.ca/tito "Tito home page"). + + +## Build openshift-ansible-bin +- Change into openshift-ansible/bin +``` +cd openshift-ansible/bin +``` +- Build a test package (no tagging needed) +``` +tito build --test --rpm +``` +- Tag a new build (bumps version number and adds log entries) +``` +tito tag +``` +- Follow the on screen tito instructions to push the tags +- Build a new package based on the latest tag information +``` +tito build --rpm +``` + + +## Build openshift-ansible-inventory +- Change into openshift-ansible/inventory +``` +cd openshift-ansible/inventory +``` +- Build a test package (no tagging needed) +``` +tito build --test --rpm +``` +- Tag a new build (bumps version number and adds log entries) +``` +tito tag +``` +- Follow the on screen tito instructions to push the tags +- Build a new package based on the latest tag information +``` +tito build --rpm +``` diff --git a/README.md b/README.md index ffdfee6f2..9a08bccd9 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,9 @@ Setup - [AWS](README_AWS.md) - [GCE](README_GCE.md) +- Build + - [How to build the openshift-ansible rpms](BUILD.md) + - Directory Structure: - [cloud.rb](cloud.rb) - light wrapper around Ansible - [cluster.sh](cluster.sh) - easily create OpenShift 3 clusters diff --git a/bin/README_BUILD b/bin/README_BUILD deleted file mode 100644 index 50010e562..000000000 --- a/bin/README_BUILD +++ /dev/null @@ -1,25 +0,0 @@ -# openshift-ansible-bin RPM Build instructions -We use tito to make building and tracking revisions easy. - -For more information on tito, please see the [Tito home page](http://rm-rf.ca/tito "Tito home page"). - - -## Build a test package (no tagging needed) -``` -tito build --test --rpm -``` - - -## Tag a new build (bumps version number and adds log entries) -``` -tito tag -``` - -Follow the on screen tito instructions. - - - -## Build a new package based on the latest tag information -``` -tito build --rpm -``` diff --git a/bin/openshift-ansible-bin.spec b/bin/openshift-ansible-bin.spec index 2b83a7d0b..7ca0cbe9d 100644 --- a/bin/openshift-ansible-bin.spec +++ b/bin/openshift-ansible-bin.spec @@ -1,11 +1,11 @@ -Summary: OpenShift Operations files for mirror +Summary: OpenShift Ansible Scripts for working with metadata hosts Name: openshift-ansible-bin -Version: 0.0.1 +Version: 0.0.0 Release: 1%{?dist} License: ASL 2.0 URL: https://github.com/openshift/openshift-ansible Source0: %{name}-%{version}.tar.gz -Requires: python2 +Requires: python2, openshift-ansible-inventory BuildRequires: python2-devel BuildArch: noarch @@ -18,17 +18,17 @@ Scripts to make it nicer when working with hosts that are defined only by metada %build %install -mkdir -p %{buildroot}/usr/bin +mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{python_sitelib}/openshift_ansible mkdir -p %{buildroot}/etc/bash_completion.d -cp -p ossh oscp opssh %{buildroot}/usr/bin +cp -p ossh oscp opssh %{buildroot}%{_bindir} cp -p awsutil.py %{buildroot}%{python_sitelib}/openshift_ansible cp -p ossh_bash_completion %{buildroot}/etc/bash_completion.d %files -/usr/bin/* -%{python_sitelib}/openshift_ansible/* +%{_bindir}/* +%{python_sitelib}/openshift_ansible/ /etc/bash_completion.d/* %changelog diff --git a/inventory/openshift-ansible-inventory.spec b/inventory/openshift-ansible-inventory.spec new file mode 100644 index 000000000..156b81b86 --- /dev/null +++ b/inventory/openshift-ansible-inventory.spec @@ -0,0 +1,37 @@ +Summary: OpenShift Ansible Inventories +Name: openshift-ansible-inventory +Version: 0.0.0 +Release: 1%{?dist} +License: ASL 2.0 +URL: https://github.com/openshift/openshift-ansible +Source0: %{name}-%{version}.tar.gz +Requires: python2 +BuildRequires: python2-devel +BuildArch: noarch + +%description +Ansible Inventories used with the openshift-ansible scripts and playbooks. + +%prep +%setup -q + +%build + +%install +mkdir -p %{buildroot}/usr/share/ansible/inventory +mkdir -p %{buildroot}/usr/share/ansible/inventory/aws +mkdir -p %{buildroot}/usr/share/ansible/inventory/gce + +cp -p multi_ec2.py multi_ec2.yaml.example %{buildroot}/usr/share/ansible/inventory +cp -p aws/ec2.py aws/ec2.ini %{buildroot}/usr/share/ansible/inventory/aws +cp -p gce/gce.py %{buildroot}/usr/share/ansible/inventory/gce + +%files +%dir /usr/share/ansible/inventory +/usr/share/ansible/inventory/multi_ec2.py* +/usr/share/ansible/inventory/multi_ec2.yaml.example +/usr/share/ansible/inventory/aws/ec2.py* +%config(noreplace) /usr/share/ansible/inventory/aws/ec2.ini +/usr/share/ansible/inventory/gce/gce.py* + +%changelog -- cgit v1.2.3