From 5529c368e4788ab9a224970bae9076c015a3da12 Mon Sep 17 00:00:00 2001 From: Amrith Kumar Date: Sun, 5 Feb 2017 19:30:23 -0500 Subject: [PATCH] fix requirements file branching for trove guests When trove-integration was a thing, and was branchless, and not part of the trove repository, we needed this kludge to get the guest requirements. Now that trove-integration is no longer a thing, and the image build is branched and part of the trove repository, we don't need to keep requirements files which are version stamped. The elements now just pick up either fedora-requirements.txt or ubuntu-requirements.txt This change will merge in master and get backported into stable/ocata. Change-Id: I87b887befb2d12f607ffec919c79d462fbde42ca --- .../fedora-guest/extra-data.d/15-trove-dep | 2 +- .../ubuntu-guest/extra-data.d/15-trove-dep | 2 +- .../requirements/fedora-requirements-juno.txt | 19 ------------ .../requirements/fedora-requirements-kilo.txt | 24 -------------- .../fedora-requirements-liberty.txt | 27 ---------------- .../fedora-requirements-mitaka.txt | 28 ----------------- .../fedora-requirements-newton.txt | 31 ------------------- ...ts-default.txt => fedora-requirements.txt} | 0 .../requirements/ubuntu-requirements-juno.txt | 19 ------------ .../requirements/ubuntu-requirements-kilo.txt | 24 -------------- .../ubuntu-requirements-liberty.txt | 26 ---------------- .../ubuntu-requirements-mitaka.txt | 27 ---------------- .../ubuntu-requirements-newton.txt | 30 ------------------ ...ts-default.txt => ubuntu-requirements.txt} | 0 14 files changed, 2 insertions(+), 257 deletions(-) delete mode 100644 integration/scripts/files/requirements/fedora-requirements-juno.txt delete mode 100644 integration/scripts/files/requirements/fedora-requirements-kilo.txt delete mode 100644 integration/scripts/files/requirements/fedora-requirements-liberty.txt delete mode 100644 integration/scripts/files/requirements/fedora-requirements-mitaka.txt delete mode 100644 integration/scripts/files/requirements/fedora-requirements-newton.txt rename integration/scripts/files/requirements/{fedora-requirements-default.txt => fedora-requirements.txt} (100%) delete mode 100644 integration/scripts/files/requirements/ubuntu-requirements-juno.txt delete mode 100644 integration/scripts/files/requirements/ubuntu-requirements-kilo.txt delete mode 100644 integration/scripts/files/requirements/ubuntu-requirements-liberty.txt delete mode 100644 integration/scripts/files/requirements/ubuntu-requirements-mitaka.txt delete mode 100644 integration/scripts/files/requirements/ubuntu-requirements-newton.txt rename integration/scripts/files/requirements/{ubuntu-requirements-default.txt => ubuntu-requirements.txt} (100%) diff --git a/integration/scripts/files/elements/fedora-guest/extra-data.d/15-trove-dep b/integration/scripts/files/elements/fedora-guest/extra-data.d/15-trove-dep index 1bcb4a9585..d430914ce3 100755 --- a/integration/scripts/files/elements/fedora-guest/extra-data.d/15-trove-dep +++ b/integration/scripts/files/elements/fedora-guest/extra-data.d/15-trove-dep @@ -10,7 +10,7 @@ source $_LIB/die BRANCH_OVERRIDE=${BRANCH_OVERRIDE:-default} ADD_BRANCH=$(basename ${BRANCH_OVERRIDE}) -REQUIREMENTS_FILE=${TROVESTACK_SCRIPTS}/files/requirements/fedora-requirements-${ADD_BRANCH}.txt +REQUIREMENTS_FILE=${TROVESTACK_SCRIPTS}/files/requirements/fedora-requirements.txt [ -n "$TMP_HOOKS_PATH" ] || die "Temp hook path not set" [ -e ${REQUIREMENTS_FILE} ] || die "Requirements not found" diff --git a/integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep b/integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep index 72130f54e0..163ff8560f 100755 --- a/integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep +++ b/integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep @@ -10,7 +10,7 @@ source $_LIB/die BRANCH_OVERRIDE=${BRANCH_OVERRIDE:-default} ADD_BRANCH=$(basename ${BRANCH_OVERRIDE}) -REQUIREMENTS_FILE=${TROVESTACK_SCRIPTS}/files/requirements/ubuntu-requirements-${ADD_BRANCH}.txt +REQUIREMENTS_FILE=${TROVESTACK_SCRIPTS}/files/requirements/ubuntu-requirements.txt [ -n "$TMP_HOOKS_PATH" ] || die "Temp hook path not set" [ -e ${REQUIREMENTS_FILE} ] || die "Requirements not found" diff --git a/integration/scripts/files/requirements/fedora-requirements-juno.txt b/integration/scripts/files/requirements/fedora-requirements-juno.txt deleted file mode 100644 index a3ddea3a0f..0000000000 --- a/integration/scripts/files/requirements/fedora-requirements-juno.txt +++ /dev/null @@ -1,19 +0,0 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. -unittest2 -testtools>=0.9.34,!=1.4.0,<=1.5.0 -extras -python-novaclient>=2.18.0,<=2.20.0 -python-swiftclient>=2.2.0,<=2.3.1 -python-cinderclient>=1.1.0,<=1.1.1 -kombu>=2.5.0,<=3.0.7 -six>=1.7.0,<=1.9.0 -Babel>=1.3,<=1.3 -python-heatclient>=0.2.9,<0.3.0 -passlib<=1.6.2 -Jinja2<=2.7.2 -python-neutronclient>=2.3.6,<2.4.0 -netifaces>=0.10.4,<=0.10.4 -oslo.config>=1.4.0,<=1.6.0 # Apache-2.0 -oslo.utils>=1.4.0,<1.5.0 # Apache-2.0 diff --git a/integration/scripts/files/requirements/fedora-requirements-kilo.txt b/integration/scripts/files/requirements/fedora-requirements-kilo.txt deleted file mode 100644 index 48bda11ba9..0000000000 --- a/integration/scripts/files/requirements/fedora-requirements-kilo.txt +++ /dev/null @@ -1,24 +0,0 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. -unittest2 -testtools>=0.9.36,!=1.2.0 -extras -python-novaclient>=2.22.0,<2.24.0 -python-swiftclient>=2.2.0,<2.5.0 -python-cinderclient>=1.1.0,<1.2.0 -kombu>=2.5.0 -six>=1.9.0 -Babel>=1.3 -python-heatclient>=0.3.0,<0.5.0 -passlib -Jinja2>=2.6 # BSD License (3 clause) -python-neutronclient>=2.3.11,<2.5.0 -netifaces>=0.10.4 -oslo.config>=1.9.3,<1.10.0 # Apache-2.0 -oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0 -oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0 -oslo.utils>=1.4.0,<1.5.0 # Apache-2.0 -oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0 -oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0 -osprofiler>=0.3.0 # Apache-2.0 diff --git a/integration/scripts/files/requirements/fedora-requirements-liberty.txt b/integration/scripts/files/requirements/fedora-requirements-liberty.txt deleted file mode 100644 index f47cbadab5..0000000000 --- a/integration/scripts/files/requirements/fedora-requirements-liberty.txt +++ /dev/null @@ -1,27 +0,0 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. -unittest2 -testtools -extras -python-novaclient>=2.22.0 -python-swiftclient>=2.2.0 -python-cinderclient>=1.1.0 -kombu>=2.5.0 -babel>=1.3 -python-heatclient>=0.3.0 -passlib -jinja2>=2.6 -python-neutronclient>=2.3.11,<3 -netifaces>=0.10.4 -oslo.context>=0.2.0,<=1.0.0 -oslo.config>=1.9.3,<1.10.0 # Apache-2.0 -oslo.messaging>=1.8.0 # Apache-2.0 -oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0 -oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0 -oslo.service>=0.1.0 # Apache-2.0 -oslo.utils>=1.4.0,<1.5.0 # Apache-2.0 -oslo.log>=1.8.0 # Apache-2.0 -osprofiler>=0.3.0 -oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0 -pexpect>=3.1,!=3.3 diff --git a/integration/scripts/files/requirements/fedora-requirements-mitaka.txt b/integration/scripts/files/requirements/fedora-requirements-mitaka.txt deleted file mode 100644 index 6f8c478cd6..0000000000 --- a/integration/scripts/files/requirements/fedora-requirements-mitaka.txt +++ /dev/null @@ -1,28 +0,0 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. -unittest2 -testtools -extras -python-novaclient>=2.22.0 -python-swiftclient>=2.2.0 -python-cinderclient>=1.1.0 -kombu>=2.5.0 -babel>=1.3 -python-heatclient>=0.3.0 -passlib -jinja2>=2.6 -python-neutronclient>=2.3.11,<3 -netifaces>=0.10.4 -oslo.config>=1.9.3 # Apache-2.0 -oslo.messaging>=1.8.0 # Apache-2.0 -oslo.i18n>=1.5.0 # Apache-2.0 -oslo.serialization>=1.4.0 # Apache-2.0 -oslo.service>=0.1.0 # Apache-2.0 -oslo.utils>=1.4.0 # Apache-2.0 -oslo.log>=1.8.0 # Apache-2.0 -osprofiler>=0.3.0 -oslo.concurrency>=1.8.0 # Apache-2.0 -pexpect>=3.1,!=3.3 -enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD -pycrypto>=2.6 # Public Domain diff --git a/integration/scripts/files/requirements/fedora-requirements-newton.txt b/integration/scripts/files/requirements/fedora-requirements-newton.txt deleted file mode 100644 index c976bfac52..0000000000 --- a/integration/scripts/files/requirements/fedora-requirements-newton.txt +++ /dev/null @@ -1,31 +0,0 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. -unittest2 -testtools -extras -python-novaclient>=2.22.0 -python-swiftclient>=2.2.0 -python-cinderclient>=1.1.0 -python-keystoneclient>=2.0.0,!=2.1.0 # Apache-2.0 -kombu>=2.5.0 -babel>=1.3 -python-heatclient>=0.3.0 -passlib -jinja2>=2.6 -PyMySQL>=0.6.2 # MIT License -python-neutronclient>=2.3.11,<3 -netifaces>=0.10.4 -oslo.config>=1.9.3 # Apache-2.0 -oslo.messaging>=1.8.0 # Apache-2.0 -oslo.i18n>=1.5.0 # Apache-2.0 -oslo.serialization>=1.4.0 # Apache-2.0 -oslo.service>=0.1.0 # Apache-2.0 -oslo.utils>=1.4.0 # Apache-2.0 -oslo.log>=1.8.0 # Apache-2.0 -osprofiler>=0.3.0 -oslo.concurrency>=1.8.0 # Apache-2.0 -pexpect>=3.1,!=3.3 -enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD -pycrypto>=2.6 # Public Domain -xmltodict>=0.10.1 # MIT diff --git a/integration/scripts/files/requirements/fedora-requirements-default.txt b/integration/scripts/files/requirements/fedora-requirements.txt similarity index 100% rename from integration/scripts/files/requirements/fedora-requirements-default.txt rename to integration/scripts/files/requirements/fedora-requirements.txt diff --git a/integration/scripts/files/requirements/ubuntu-requirements-juno.txt b/integration/scripts/files/requirements/ubuntu-requirements-juno.txt deleted file mode 100644 index a3ddea3a0f..0000000000 --- a/integration/scripts/files/requirements/ubuntu-requirements-juno.txt +++ /dev/null @@ -1,19 +0,0 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. -unittest2 -testtools>=0.9.34,!=1.4.0,<=1.5.0 -extras -python-novaclient>=2.18.0,<=2.20.0 -python-swiftclient>=2.2.0,<=2.3.1 -python-cinderclient>=1.1.0,<=1.1.1 -kombu>=2.5.0,<=3.0.7 -six>=1.7.0,<=1.9.0 -Babel>=1.3,<=1.3 -python-heatclient>=0.2.9,<0.3.0 -passlib<=1.6.2 -Jinja2<=2.7.2 -python-neutronclient>=2.3.6,<2.4.0 -netifaces>=0.10.4,<=0.10.4 -oslo.config>=1.4.0,<=1.6.0 # Apache-2.0 -oslo.utils>=1.4.0,<1.5.0 # Apache-2.0 diff --git a/integration/scripts/files/requirements/ubuntu-requirements-kilo.txt b/integration/scripts/files/requirements/ubuntu-requirements-kilo.txt deleted file mode 100644 index 48bda11ba9..0000000000 --- a/integration/scripts/files/requirements/ubuntu-requirements-kilo.txt +++ /dev/null @@ -1,24 +0,0 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. -unittest2 -testtools>=0.9.36,!=1.2.0 -extras -python-novaclient>=2.22.0,<2.24.0 -python-swiftclient>=2.2.0,<2.5.0 -python-cinderclient>=1.1.0,<1.2.0 -kombu>=2.5.0 -six>=1.9.0 -Babel>=1.3 -python-heatclient>=0.3.0,<0.5.0 -passlib -Jinja2>=2.6 # BSD License (3 clause) -python-neutronclient>=2.3.11,<2.5.0 -netifaces>=0.10.4 -oslo.config>=1.9.3,<1.10.0 # Apache-2.0 -oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0 -oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0 -oslo.utils>=1.4.0,<1.5.0 # Apache-2.0 -oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0 -oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0 -osprofiler>=0.3.0 # Apache-2.0 diff --git a/integration/scripts/files/requirements/ubuntu-requirements-liberty.txt b/integration/scripts/files/requirements/ubuntu-requirements-liberty.txt deleted file mode 100644 index 1f3d0d7b61..0000000000 --- a/integration/scripts/files/requirements/ubuntu-requirements-liberty.txt +++ /dev/null @@ -1,26 +0,0 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. -unittest2 -testtools -extras -python-novaclient>=2.18.0 -python-swiftclient>=2.2.0 -python-cinderclient>=1.1.0 -kombu>=2.5.0 -six>=1.7.0 -babel -python-heatclient>=0.2.9 -passlib -jinja2 -python-neutronclient>=2.3.6,<3 -netifaces>=0.10.4 -oslo.context>=0.2.0,<=1.0.0 -oslo.config>=1.4.0 # Apache-2.0 -oslo.messaging>=1.4.0,!=1.5.0 -oslo.i18n>=1.0.0 -oslo.serialization>=1.0.0 -oslo.service>=0.1.0 # Apache-2.0 -oslo.utils>=1.1.0 -osprofiler>=0.3.0 -oslo.concurrency>=0.3.0 diff --git a/integration/scripts/files/requirements/ubuntu-requirements-mitaka.txt b/integration/scripts/files/requirements/ubuntu-requirements-mitaka.txt deleted file mode 100644 index 8724d163fb..0000000000 --- a/integration/scripts/files/requirements/ubuntu-requirements-mitaka.txt +++ /dev/null @@ -1,27 +0,0 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. -unittest2 -testtools -extras -python-novaclient>=2.18.0 -python-swiftclient>=2.2.0 -python-cinderclient>=1.1.0 -kombu>=2.5.0 -six>=1.7.0 -babel -python-heatclient>=0.2.9 -passlib -jinja2 -python-neutronclient>=2.3.6,<3 -netifaces>=0.10.4 -oslo.config>=1.4.0 # Apache-2.0 -oslo.messaging>=1.4.0,!=1.5.0 -oslo.i18n>=1.0.0 -oslo.serialization>=1.0.0 -oslo.service>=0.1.0 # Apache-2.0 -oslo.utils>=1.1.0 -osprofiler>=0.3.0 -oslo.concurrency>=0.3.0 -enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD -pycrypto>=2.6 # Public Domain diff --git a/integration/scripts/files/requirements/ubuntu-requirements-newton.txt b/integration/scripts/files/requirements/ubuntu-requirements-newton.txt deleted file mode 100644 index 9607060b4b..0000000000 --- a/integration/scripts/files/requirements/ubuntu-requirements-newton.txt +++ /dev/null @@ -1,30 +0,0 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. -unittest2 -testtools -extras -python-novaclient>=2.18.0 -python-swiftclient>=2.2.0 -python-cinderclient>=1.1.0 -python-keystoneclient>=2.0.0,!=2.1.0 # Apache-2.0 -kombu>=2.5.0 -six>=1.7.0 -babel -python-heatclient>=0.2.9 -passlib -jinja2 -PyMySQL>=0.6.2 # MIT License -python-neutronclient>=2.3.6,<3 -netifaces>=0.10.4 -oslo.config>=1.4.0 # Apache-2.0 -oslo.messaging>=1.4.0,!=1.5.0 -oslo.i18n>=1.0.0 -oslo.serialization>=1.0.0 -oslo.service>=0.1.0 # Apache-2.0 -oslo.utils>=1.1.0 -osprofiler>=0.3.0 -oslo.concurrency>=0.3.0 -enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD -pycrypto>=2.6 # Public Domain -xmltodict>=0.10.1 # MIT diff --git a/integration/scripts/files/requirements/ubuntu-requirements-default.txt b/integration/scripts/files/requirements/ubuntu-requirements.txt similarity index 100% rename from integration/scripts/files/requirements/ubuntu-requirements-default.txt rename to integration/scripts/files/requirements/ubuntu-requirements.txt