summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-23 17:12:31 +0000
committerGerrit Code Review <review@openstack.org>2017-01-23 17:12:31 +0000
commit6d1105614d3e2d1ba551be4d422c689a0cf3f3af (patch)
treef23a9685e744fe12b159f0ac9065e38a9e25a887
parentb62cad113ac10930f24dd3f7b946f979a4b8c76d (diff)
parent85e8dbb2a6cfd336314e61de4a4510563877f32c (diff)
Merge "Use stable/newton branch in tox_install.sh and tox.ini" into stable/newtonnewton-eol
-rwxr-xr-xtools/tox_install.sh2
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
index 30788fb..232701f 100755
--- a/tools/tox_install.sh
+++ b/tools/tox_install.sh
@@ -5,7 +5,7 @@
5# the constraints file before applying it for from-source installation. 5# the constraints file before applying it for from-source installation.
6 6
7ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner 7ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
8BRANCH_NAME=master 8BRANCH_NAME=stable/newton
9CLIENT_NAME=python-magnumclient 9CLIENT_NAME=python-magnumclient
10requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?) 10requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?)
11 11
diff --git a/tox.ini b/tox.ini
index 3ded131..67f8d94 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ skipsdist = True
6[testenv] 6[testenv]
7usedevelop = True 7usedevelop = True
8install_command = 8install_command =
9 {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} 9 {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/newton} {opts} {packages}
10whitelist_externals = find 10whitelist_externals = find
11setenv = 11setenv =
12 VIRTUAL_ENV={envdir} 12 VIRTUAL_ENV={envdir}