From 19af6bb838ad4939e24542c077e65949fb74c808 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Thu, 16 Aug 2018 18:30:13 +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: I78488e22069af48c4d86d0231af8dc83d55d6a50 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 18c6740..9ad4ca1 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 =