Fix tox_install.sh script

currently it actually hardcodes the horizon branch to install as
'master' with no way of overriding it via env var as it was intended.

Additionally changed BRANCH_NAME to 'stable/pike' in tox.ini

Change-Id: Ia18353387b00e2807d69dcbeca08457bd662d26e
(cherry picked from commit 8bf9fbe04b)
This commit is contained in:
Pavlo Shchelokovskyy 2018-01-10 15:23:12 +02:00
parent 804206bb9c
commit 6de231d86a
2 changed files with 2 additions and 3 deletions

View File

@ -14,12 +14,11 @@
# pip install {opts} {packages}
ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
BRANCH_NAME=master
GIT_BASE=${GIT_BASE:-https://git.openstack.org/}
install_project() {
local project=$1
local branch=${2:-$BRANCH_NAME}
local branch=${2:-${BRANCH_NAME:-master}}
local module_name=${project//-/_}
set +e

View File

@ -8,7 +8,7 @@ usedevelop = True
install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages}
setenv =
VIRTUAL_ENV={envdir}
BRANCH_NAME=master
BRANCH_NAME=stable/pike
CLIENT_NAME=sahara-dashboard
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt