Extend default setenv instead of replacing it in tox.ini

Some tox jobs[1] define their own setenv without extending/referencing
default setenv, it disallows to define environment variables shared by
all jobs. This change updates previous jobs[1] in order to extend
instead of replacing default setenv and enable global environement
variables (used in daughter change).

One remark, this change sets VIRTUAL_ENV environment variable in updated
jobs[1] but it has no effect on them.

[1] (dsvm-)functional, (dsvm-)fullstack and api jobs

Closes-Bug: #1468059
Change-Id: I99184f7375571fb8569a24ba04ae267108f5da08

diff --git a/tox.ini b/tox.ini
index 45f8968fd4876efa2c3a59104f98501227c75722..75eb74c243b4cab103ed66cf59f5a77de9bd4d26 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -19,13 +19,15 @@ commands =
 
 [testenv:api]
 basepython = python2.7
-setenv = OS_TEST_PATH=./neutron/tests/api
+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
 
 [testenv:functional]
 basepython = python2.7
-setenv = OS_TEST_PATH=./neutron/tests/functional
+setenv = {[testenv]setenv}
+         OS_TEST_PATH=./neutron/tests/functional
          OS_TEST_TIMEOUT=180
 deps =
   {[testenv]deps}
@@ -33,7 +35,8 @@ deps =
 
 [testenv:dsvm-functional]
 basepython = python2.7
-setenv = OS_TEST_PATH=./neutron/tests/functional
+setenv = {[testenv]setenv}
+         OS_TEST_PATH=./neutron/tests/functional
          OS_SUDO_TESTING=1
          OS_ROOTWRAP_CMD=sudo {envdir}/bin/neutron-rootwrap {envdir}/etc/neutron/rootwrap.conf
          OS_ROOTWRAP_DAEMON_CMD=sudo {envdir}/bin/neutron-rootwrap-daemon {envdir}/etc/neutron/rootwrap.conf
@@ -44,14 +47,16 @@ deps =
   {[testenv:functional]deps}
 
 [testenv:fullstack]
-setenv = OS_TEST_PATH=./neutron/tests/fullstack
+setenv = {[testenv]setenv}
+         OS_TEST_PATH=./neutron/tests/fullstack
          OS_TEST_TIMEOUT=180
 deps =
   {[testenv]deps}
   -r{toxinidir}/neutron/tests/functional/requirements.txt
 
 [testenv:dsvm-fullstack]
-setenv = OS_TEST_PATH=./neutron/tests/fullstack
+setenv = {[testenv]setenv}
+         OS_TEST_PATH=./neutron/tests/fullstack
          OS_SUDO_TESTING=1
          OS_ROOTWRAP_CMD=sudo {envdir}/bin/neutron-rootwrap {envdir}/etc/neutron/rootwrap.conf
          OS_ROOTWRAP_DAEMON_CMD=sudo {envdir}/bin/neutron-rootwrap-daemon {envdir}/etc/neutron/rootwrap.conf