From b36c0b9236876abd4f7732263c60e9ccd276792c Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Thu, 16 Aug 2018 18:26:00 +0100 Subject: [PATCH] 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: I19fc2e4ee2b16dd3c9343af9caf8ddd452f11125 Needed-By: https://review.openstack.org/579371 --- tox.ini | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 63dd46fb..811fff66 100644 --- a/tox.ini +++ b/tox.ini @@ -11,14 +11,17 @@ install_command = commands = /usr/bin/find . -type f -name "*.pyc" -delete passenv = + COMMON_TESTS_PATH HOME - USER http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY + TESTING_BRANCH + TESTING_HOME + USER whitelist_externals = bash setenv =