summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Pretorius <jesse.pretorius@rackspace.co.uk>2018-08-16 15:31:11 +0100
committerJesse Pretorius <jesse.pretorius@rackspace.co.uk>2018-08-16 15:31:11 +0100
commitaff6de769c2d0a9297220eb4f27a84155bff43fe (patch)
tree9f89d5dea85352cf481f690fe772281fb5709ccd
parent3d24b2fcf1167daa3f8336ba06b962c16be6fe99 (diff)
Use the TESTING_BRANCH env var for constraints
The TESTING_BRANCH environment variable is provided by the run_tests.sh script and is derived from the .gitreview file. This ensures that once the master branch becomes a stable branch, the constraints from the stable branch in the integrated repository will automatically get used once the .gitreview file is updated. To ensure that the required environment variables are present we export them appropriately in run_tests.sh and modify the tox configuration to pass them into the tox test. Change-Id: I4863378335fea1541a6323cfad909b957c394bd7 Needed-By: https://review.openstack.org/579371
Notes
Notes (review): Code-Review+2: Kevin Carter (cloudnull) <kevin@cloudnull.com> Code-Review+2: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk> Workflow+1: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sun, 19 Aug 2018 18:32:29 +0000 Reviewed-on: https://review.openstack.org/592501 Project: openstack/openstack-ansible-os_almanach Branch: refs/heads/master
-rw-r--r--tox.ini5
1 files changed, 4 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index ad04b36..b1a2cfb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,14 +11,17 @@ install_command =
11commands = 11commands =
12 /usr/bin/find . -type f -name "*.pyc" -delete 12 /usr/bin/find . -type f -name "*.pyc" -delete
13passenv = 13passenv =
14 COMMON_TESTS_PATH
14 HOME 15 HOME
15 USER
16 http_proxy 16 http_proxy
17 HTTP_PROXY 17 HTTP_PROXY
18 https_proxy 18 https_proxy
19 HTTPS_PROXY 19 HTTPS_PROXY
20 no_proxy 20 no_proxy
21 NO_PROXY 21 NO_PROXY
22 TESTING_BRANCH
23 TESTING_HOME
24 USER
22whitelist_externals = 25whitelist_externals =
23 bash 26 bash
24setenv = 27setenv =