Enable Zesty-Ocata Amulet Tests

- Turn on Zesty-Ocata Amulet test definitions.
- Standardize test-requirements.txt
- Sync charm helpers for various fixes

Change-Id: I931fe3cf63b5bdf1ecb62c6f41a7d83bd1560350
This commit is contained in:
David Ames 2017-04-27 11:11:06 -07:00
parent 106686b9cd
commit 03283c4a20
3 changed files with 16 additions and 9 deletions

View File

@ -11,15 +11,17 @@ requests==2.6.0
# Liberty client lower constraints # Liberty client lower constraints
amulet>=1.14.3,<2.0 amulet>=1.14.3,<2.0
bundletester>=0.6.1,<1.0 bundletester>=0.6.1,<1.0
python-ceilometerclient>=1.5.0,<2.0 python-ceilometerclient>=1.5.0
python-cinderclient>=1.4.0,<2.0 python-cinderclient>=1.4.0
python-glanceclient>=1.1.0,<2.0 python-glanceclient>=1.1.0
python-heatclient>=0.8.0,<1.0 python-heatclient>=0.8.0
python-keystoneclient>=1.7.1,<2.0 python-keystoneclient>=1.7.1
python-neutronclient>=3.1.0,<4.0 python-neutronclient>=3.1.0
python-novaclient>=2.30.1,<3.0 python-novaclient>=2.30.1
python-openstackclient>=1.7.0,<2.0 python-openstackclient>=1.7.0
python-swiftclient>=2.6.0,<3.0 python-swiftclient>=2.6.0
pika>=0.10.0,<1.0 pika>=0.10.0,<1.0
distro-info distro-info
# END: Amulet OpenStack Charm Helper Requirements # END: Amulet OpenStack Charm Helper Requirements
# NOTE: workaround for 14.04 pip/tox
pytz

0
tests/gate-basic-zesty-ocata Normal file → Executable file
View File

View File

@ -21,6 +21,11 @@ basepython = python2.7
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
[testenv:py35]
basepython = python3.5
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:pep8] [testenv:pep8]
basepython = python2.7 basepython = python2.7
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt