diff options
14 files changed, 2 insertions, 257 deletions
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 1bcb4a95..d430914c 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 72130f54..163ff856 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 a3ddea3a..00000000 --- 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 48bda11b..00000000 --- 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 f47cbada..00000000 --- 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 6f8c478c..00000000 --- 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 c976bfac..00000000 --- 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 index c976bfac..c976bfac 100644 --- a/integration/scripts/files/requirements/fedora-requirements-default.txt +++ b/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 a3ddea3a..00000000 --- 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 48bda11b..00000000 --- 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 1f3d0d7b..00000000 --- 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 8724d163..00000000 --- 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 9607060b..00000000 --- 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 index 9607060b..9607060b 100644 --- a/integration/scripts/files/requirements/ubuntu-requirements-default.txt +++ b/integration/scripts/files/requirements/ubuntu-requirements.txt |