summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Pretorius <jesse.pretorius@rackspace.co.uk>2018-08-16 18:19:40 +0100
committerJesse Pretorius <jesse.pretorius@rackspace.co.uk>2018-08-16 18:19:40 +0100
commit90ce328ef27407a73783e0d95b7692846c2d193a (patch)
treeda41c1cc45541d042b31e0ff17a617356578d5d4
parent481e5c26f9c7c4e4243f40bafd2676a25c06369f (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: I513888f9b4633347d89ea07a0641728b6a925108 Needed-By: https://review.openstack.org/579371
Notes
Notes (review): Code-Review+2: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk> Code-Review+1: Filippo Inzaghi <zhao.daqing@99cloud.net> Code-Review+2: Jean-Philippe Evrard <jean-philippe@evrard.me> Workflow+1: Jean-Philippe Evrard <jean-philippe@evrard.me> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 21 Aug 2018 10:16:02 +0000 Reviewed-on: https://review.openstack.org/592594 Project: openstack/openstack-ansible-os_magnum 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 7a5d0b6..c7e614c 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 =