openstack/trove
Code Issues Proposed changes

fix requirements file branching for trove guests

Browse Source 
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
This commit is contained in:
Amrith Kumar 2017-02-05 19:30:23 -05:00
parent 92db0e04b8
commit 5529c368e4
14 changed files with 2 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration/scripts/files/elements/fedora-guest/extra-data.d/15-trove-dep
View File

@ -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"

2
integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep
View File

@ -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"

19
integration/scripts/files/requirements/fedora-requirements-juno.txt
View File

@ -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

24
integration/scripts/files/requirements/fedora-requirements-kilo.txt
View File

@ -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

27
integration/scripts/files/requirements/fedora-requirements-liberty.txt
View File

@ -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

28
integration/scripts/files/requirements/fedora-requirements-mitaka.txt
View File

@ -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

31
integration/scripts/files/requirements/fedora-requirements-newton.txt
View File

@ -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

0
integration/scripts/files/requirements/fedora-requirements-default.txt → integration/scripts/files/requirements/fedora-requirements.txt
View File

19
integration/scripts/files/requirements/ubuntu-requirements-juno.txt
View File

@ -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

24
integration/scripts/files/requirements/ubuntu-requirements-kilo.txt
View File

@ -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

26
integration/scripts/files/requirements/ubuntu-requirements-liberty.txt
View File

@ -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

27
integration/scripts/files/requirements/ubuntu-requirements-mitaka.txt
View File

@ -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

30
integration/scripts/files/requirements/ubuntu-requirements-newton.txt
View File

@ -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

0
integration/scripts/files/requirements/ubuntu-requirements-default.txt → integration/scripts/files/requirements/ubuntu-requirements.txt
View File