openstack
/
neutron-lbaas
Code Issues Proposed changes

Put sanity back into lbaas jobs 

Move away from locally installed packages and move tempest
requirement to specific requirements file temporarily until
the stable/mitaka g-r situation is sorted.

This is a fix directly made to stable/mitaka.

Change-Id: I033c035be4e72a56badd1283322bf92c12fcf13d
This commit is contained in:
Armando Migliaccio 2016-04-08 17:49:40 -07:00
parent 19b18f0503
commit 5f6794b7ae
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron_lbaas/tests/tempest/requirements.txt Normal file
View File

@ -0,0 +1,7 @@
# Additional requirements for api tests
# 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.
tempest>=11.0.0 # Apache-2.0

20
tox.ini
View File

@ -70,50 +70,46 @@ local-check-factory = neutron.hacking.checks.factory
# If you are running the tests locally you should set the env variable
# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
[testenv:apiv1]
sitepackages = True
passenv = TEMPEST_CONFIG_DIR
setenv =
OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v1/api
OS_TESTR_CONCURRENCY=1
deps =
{[testenv]deps}
git+https://git.openstack.org/openstack/tempest#egg=tempest
{[testenv]deps}
-r{toxinidir}/neutron_lbaas/tests/tempest/requirements.txt
# If you are running the tests locally you should set the env variable
# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
[testenv:apiv2]
sitepackages = True
passenv = TEMPEST_CONFIG_DIR
setenv =
OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v2/api
OS_TESTR_CONCURRENCY=1
deps =
{[testenv]deps}
git+https://git.openstack.org/openstack/tempest#egg=tempest
{[testenv]deps}
-r{toxinidir}/neutron_lbaas/tests/tempest/requirements.txt
# If you are running the tests locally you should set the env variable
# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
[testenv:scenario]
sitepackages = True
passenv = TEMPEST_CONFIG_DIR
setenv =
OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v2/scenario
OS_TESTR_CONCURRENCY=1
deps =
{[testenv]deps}
git+https://git.openstack.org/openstack/tempest#egg=tempest
{[testenv]deps}
-r{toxinidir}/neutron_lbaas/tests/tempest/requirements.txt
# If you are running the tests locally you should set the env variable
# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
[testenv:ddt]
sitepackages = True
passenv = TEMPEST_CONFIG_DIR
setenv =
OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v2/ddt
OS_TESTR_CONCURRENCY=1
deps =
{[testenv]deps}
git+https://git.openstack.org/openstack/tempest#egg=tempest
{[testenv]deps}
-r{toxinidir}/neutron_lbaas/tests/tempest/requirements.txt
[testenv:genconfig]
commands = {toxinidir}/tools/generate_config_file_samples.sh