openstack
/
neutron-lbaas
Code Issues Proposed changes

Revert "Revert "Remove TEMPEST_CONFIG_DIR in the api tox env"" 

This reverts commit 286f5d41dc.

The revert was merged too quickly, without waiting for tox project to fix us.
The gate passed for the revert only because infra folks removed images
that had new tox in them. We will be broken by the next images though.

Change-Id: Idad2c656e4271d1222e6f8939eb90c6353e1fe67
This commit is contained in:
Ihar Hrachyshka 2015-11-12 17:27:35 +00:00
parent 286f5d41dc
commit 4270d559d3
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tox.ini
View File

@ -65,30 +65,46 @@ exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,to
import_exceptions = neutron.i18n
local-check-factory = neutron.hacking.checks.factory
# TODO(armax): due to bug #1515335, set TEMPEST_CONFIG_DIR in your
# local env, like this:
#
# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
#
[testenv:apiv1]
sitepackages = True
setenv =
OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v1/api
OS_TESTR_CONCURRENCY=1
TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc}
# TODO(armax): due to bug #1515335, set TEMPEST_CONFIG_DIR in your
# local env, like this:
#
# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
#
[testenv:apiv2]
sitepackages = True
setenv =
OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v2/api
OS_TESTR_CONCURRENCY=1
TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc}
# TODO(armax): due to bug #1515335, set TEMPEST_CONFIG_DIR in your
# local env, like this:
#
# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
#
[testenv:scenario]
sitepackages = True
setenv =
OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v2/scenario
OS_TESTR_CONCURRENCY=1
TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc}
# TODO(armax): due to bug #1515335, set TEMPEST_CONFIG_DIR in your
# local env, like this:
#
# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
#
[testenv:ddt]
sitepackages = True
setenv =
OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v2/ddt
OS_TESTR_CONCURRENCY=1
TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc}