From ee4344409998a8f4955d194b25bd0f126105dfd0 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Thu, 16 Aug 2018 15:16:20 +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: Ia5ca15a5ee3763bdfb76087f99a371d78ed6258b Needed-By: https://review.openstack.org/579371 --- tox.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tox.ini b/tox.ini index fc6282a9b8..ad81e160c0 100644 --- a/tox.ini +++ b/tox.ini @@ -13,6 +13,7 @@ deps = -r{toxinidir}/global-requirement-pins.txt -r{toxinidir}/test-requirements.txt passenv = + COMMON_TESTS_PATH HOME http_proxy HTTP_PROXY @@ -20,6 +21,9 @@ passenv = HTTPS_PROXY no_proxy NO_PROXY + TESTING_BRANCH + TESTING_HOME + USER whitelist_externals = bash setenv =