Browse Source

Depend on tempest in test-requirements.txt

This replaces the requirements.stub dependency approach for
heat_integrationtests with a single dependency on tempest in
test-requirements.txt.

tempest provides all the required dependencies for the current
heat_integrationtests, and this helps the transition of being able to
run tests both with the current runner and as a tempest plugin.

blueprint tempest-plugin-support

Change-Id: I6fc5886feec5de71826f640cd29990114bd7781c
changes/69/348569/7
Steve Baker 6 years ago
parent
commit
d21be7dedc
  1. 31
      heat_integrationtests/requirements.stub
  2. 3
      test-requirements.txt
  3. 8
      tox.ini

31
heat_integrationtests/requirements.stub

@ -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.
# These are stubs for requirements. This file must be processed with
# heat_integrationtests/install-requirements to generate and install the real
# requirements.txt where versions for packages present in
# main project requirements will be synced from main requirements files.
pbr
kombu
os-collect-config
oslo.log
oslo.messaging
oslo.concurrency
oslo.config
oslo.utils
paramiko
python-ceilometerclient
python-cinderclient
python-keystoneclient
python-heatclient
python-neutronclient
python-novaclient
python-swiftclient
PyYAML
requests
six
testrepository
testscenarios
testtools

3
test-requirements.txt

@ -23,6 +23,7 @@ testscenarios>=0.4 # Apache-2.0/BSD
testtools>=1.4.0 # MIT
testresources>=0.2.4 # Apache-2.0/BSD
reno>=1.8.0 # Apache2
# Next two are used in integration tests only
# Next are used in integration tests only
os-collect-config # Apache-2.0
paramiko>=2.0 # LGPLv2.1+
tempest>=12.1.0 # Apache-2.0

8
tox.ini

@ -5,13 +5,15 @@ skipsdist = True
[testenv]
setenv = VIRTUAL_ENV={envdir}
OS_TEST_PATH=heat/tests
TESTR_START_DIR=heat/tests
usedevelop = True
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands =
find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.pyc' -delete
python setup.py testr --slowest --testr-args='^(?!heat_integrationtests){posargs}'
python setup.py testr --slowest --testr-args='{posargs}'
whitelist_externals =
bash
@ -29,8 +31,8 @@ setenv = VIRTUAL_ENV={envdir}
TESTR_START_DIR=heat_integrationtests
passenv = OS_*
usedevelop = False
install_command = {toxinidir}/heat_integrationtests/install-requirements --stub {toxinidir}/heat_integrationtests/requirements.stub --source {toxinidir}/requirements.txt --source {toxinidir}/test-requirements.txt {packages} {opts}
deps = -t{toxinidir}/heat_integrationtests/requirements.txt
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands =
bash tools/pretty_tox.sh '{posargs}'

Loading…
Cancel
Save