Use stable/newton branch in tox_install.sh and tox.ini

This change modifies tox_install.sh wrapper to pick dependencies
for the correct branch for stable/newton release.

Adjust upper-constraints.txt in tox.ini to pick dependencies
from stable/newton branch.

Change-Id: I2e2680ab86dd8f0d63dcc73f4d7bac2288c76975
This commit is contained in:
Michal Pryc 2016-11-24 11:58:38 +01:00
parent 2600d963ff
commit 9aef8b5b9c
2 changed files with 2 additions and 2 deletions

View File

@ -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-muranoclient
requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?)

View File

@ -7,7 +7,7 @@ skipsdist = True
usedevelop = True
whitelist_externals = bash
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}
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
deps =