From a3154b03ac60df586bd8fd67f03c20327f2dde41 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 11 Nov 2015 20:16:44 +0100 Subject: [PATCH] Revert "Remove TEMPEST_CONFIG_DIR in the api tox env" This reverts commit a32e31a624cf5190ed267effed8f7db2c9919949. We should be able to merge the revert back once tox project fixes the bug* on their side. * https://bitbucket.org/hpk42/tox/issues/285/tox-220-breaks-some-toxini-config-files Change-Id: Ic1f5391c687b2683cbaab210c543022aa1f26e83 Related-Bug: #1515335 --- tox.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 26e842892..ef91b3ed4 100644 --- a/tox.ini +++ b/tox.ini @@ -23,9 +23,8 @@ commands = basepython = python2.7 setenv = {[testenv]setenv} OS_TEST_PATH=./neutron/tests/api + TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc} OS_TEST_API_WITH_REST=1 -# If you are running the tests locally you should set the env variable -# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc [testenv:common] # Fake job to define environment variables shared between dsvm/non-dsvm jobs -- 2.45.2