From d08bdd1e23967f150946b9b6b3e94b18198de749 Mon Sep 17 00:00:00 2001
From: Michal Pryc <mpryc@redhat.com>
Date: Thu, 24 Nov 2016 10:13:26 +0100
Subject: [PATCH] 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: Ic63c363bf12e2f31b18271ef8bf26cbe5f5ca212
---
 tools/tox_install.sh | 2 +-
 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 $?)
 
diff --git a/tox.ini b/tox.ini
index 9eb0a1a0..2d3b4dfc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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}