Merge "Fix tox_install.sh script" into stable/pike

This commit is contained in:
Zuul 2018-02-05 13:59:59 +00:00 committed by Gerrit Code Review
commit d56477dba6
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