From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Thu, 12 Nov 2015 09:57:44 +0000 (+0000)
Subject: Revert "Revert "Remove TEMPEST_CONFIG_DIR in the api tox env""
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=be63289c273fa02159a6958e0b456d5fda217431;p=openstack-build%2Fneutron-build.git

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

This reverts commit a3154b03ac60df586bd8fd67f03c20327f2dde41.

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: I148c80e5b9512fee280ecbf3ca7498ddf1cfd96d
---

diff --git a/tox.ini b/tox.ini
index ef91b3ed4..26e842892 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,8 +23,9 @@ 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