From c177a6c3e7d6278fd5c305813391a38a78705e20 Mon Sep 17 00:00:00 2001 From: David Ames Date: Thu, 27 Apr 2017 11:13:26 -0700 Subject: [PATCH] Enable Zesty-Ocata Amulet Tests - Turn on Zesty-Ocata Amulet test definitions. - Standardize test-requirements.txt - Sync charm helpers for various fixes Change-Id: I883e163ca45a1e7cb4d370c2f0d1664b66372c66 --- src/test-requirements.txt | 33 ++++++++++++++++++++++---------- src/tests/gate-basic-zesty-ocata | 0 src/tests/tests.yaml | 1 + src/tox.ini | 2 +- 4 files changed, 25 insertions(+), 11 deletions(-) mode change 100644 => 100755 src/tests/gate-basic-zesty-ocata diff --git a/src/test-requirements.txt b/src/test-requirements.txt index 3ffd9c2..3cb4ae7 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -1,20 +1,33 @@ -# charm-proof +# 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. +coverage>=3.6 +mock>=1.2 +flake8>=2.2.4,<=2.4.1 +os-testr>=0.4.1 charm-tools>=2.0.0 +requests==2.6.0 # amulet deployment helpers bzr+lp:charm-helpers#egg=charmhelpers # BEGIN: Amulet OpenStack Charm Helper Requirements # Liberty client lower constraints amulet>=1.14.3,<2.0 bundletester>=0.6.1,<1.0 -python-keystoneclient>=1.7.1,<2.0 -python-designateclient>=1.5,<2.0 -python-cinderclient>=1.4.0,<2.0 -python-glanceclient>=1.1.0,<2.0 -python-heatclient>=0.8.0,<1.0 -python-neutronclient>=3.1.0,<4.0 -python-novaclient>=2.30.1,<3.0 -python-openstackclient>=1.7.0,<2.0 -python-swiftclient>=2.6.0,<3.0 +aodhclient>=0.1.0 +python-barbicanclient>=4.0.1 +python-ceilometerclient>=1.5.0 +python-cinderclient>=1.4.0 +python-designateclient>=1.5 +python-glanceclient>=1.1.0 +python-heatclient>=0.8.0 +python-keystoneclient>=1.7.1 +python-manilaclient>=1.8.1 +python-neutronclient>=3.1.0 +python-novaclient>=2.30.1 +python-openstackclient>=1.7.0 +python-swiftclient>=2.6.0 pika>=0.10.0,<1.0 distro-info # END: Amulet OpenStack Charm Helper Requirements +# NOTE: workaround for 14.04 pip/tox +pytz diff --git a/src/tests/gate-basic-zesty-ocata b/src/tests/gate-basic-zesty-ocata old mode 100644 new mode 100755 diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 4cf93d0..cb774a7 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -15,3 +15,4 @@ makefile: [] # and tox instead. ie. The venv is constructed before bundletester # is invoked. #python-packages: +reset_timeout: 300 diff --git a/src/tox.ini b/src/tox.ini index 3bc4d0b..276db2f 100644 --- a/src/tox.ini +++ b/src/tox.ini @@ -10,7 +10,7 @@ setenv = VIRTUAL_ENV={envdir} PYTHONHASHSEED=0 AMULET_SETUP_TIMEOUT=2700 whitelist_externals = juju -passenv = HOME TERM AMULET_* CS_API_URL +passenv = HOME TERM AMULET_* CS_API_* deps = -r{toxinidir}/test-requirements.txt install_command = pip install --allow-unverified python-apt {opts} {packages}