diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-09 17:53:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-09 17:53:17 +0000 |
| commit | f1c082dd9b9c5d9dc33d9cb5df10fd5330aabe88 (patch) | |
| tree | 00f91ba8a4f7adec3b056967efdc690ff6165b0e | |
| parent | a37addb7b034105ce03ee35a0a1610d191c4b269 (diff) | |
| parent | d08bdd1e23967f150946b9b6b3e94b18198de749 (diff) | |
| download | python-openstackclient-f1c082dd9b9c5d9dc33d9cb5df10fd5330aabe88.tar.gz | |
Merge "Use stable/newton branch in tox_install.sh and tox.ini" into stable/newton
| -rwxr-xr-x | tools/tox_install.sh | 2 | ||||
| -rw-r--r-- | tox.ini | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/tox_install.sh b/tools/tox_install.sh index 4af3be16..5625151f 100755 --- a/tools/tox_install.sh +++ b/tools/tox_install.sh @@ -5,7 +5,7 @@ # the constraints file before applying it for from-source installation. ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner -BRANCH_NAME=master +BRANCH_NAME=stable/newton CLIENT_NAME=python-openstackclient requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?) @@ -6,7 +6,7 @@ skipdist = True [testenv] usedevelop = True install_command = - {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} + {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} setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/test-requirements.txt commands = ostestr {posargs} |