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: I1f07fb41c7f81b9f6223dec3afa20636eb638e64
This commit is contained in:
Michal Pryc 2016-11-24 11:55:22 +01:00
parent 63398c2751
commit 85e8dbb2a6
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-magnumclient
requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?)

View File

@ -6,7 +6,7 @@ skipsdist = 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}
whitelist_externals = find
setenv =
VIRTUAL_ENV={envdir}