summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavlo Shchelokovskyy <shchelokovskyy@gmail.com>2018-01-10 15:23:12 +0200
committerPavlo Shchelokovskyy <shchelokovskyy@gmail.com>2018-02-05 15:40:49 +0200
commita93165f6dc3dca1e7e562c6c9bdf53650864a7ab (patch)
treee98e03c0c3297ceb59493fe9ea1d13150a4cc1e7
parent19bfe33d24f9ac9555621d14fad3538c5966c14c (diff)
Fix tox_install.sh script6.0.3stable/ocata
currently it actually hardcodes the horizon branch to install as 'master' with no way of overriding it via env var as it was intended. Change-Id: Ia18353387b00e2807d69dcbeca08457bd662d26e (cherry picked from commit 8bf9fbe04bdec54a77ca31b898943916619f2933)
Notes
Notes (review): Code-Review-1: Andreas Jaeger <jaegerandi@gmail.com> Code-Review+2: Telles Mota Vidal Nóbrega <tenobreg@redhat.com> Workflow+1: Telles Mota Vidal Nóbrega <tenobreg@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 05 Feb 2018 14:15:59 +0000 Reviewed-on: https://review.openstack.org/532524 Project: openstack/sahara-dashboard Branch: refs/heads/stable/ocata
-rwxr-xr-xtools/tox_install.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
index 7890956..61abb78 100755
--- a/tools/tox_install.sh
+++ b/tools/tox_install.sh
@@ -14,12 +14,11 @@
14# pip install {opts} {packages} 14# pip install {opts} {packages}
15 15
16ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner 16ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
17BRANCH_NAME=master
18GIT_BASE=${GIT_BASE:-https://git.openstack.org/} 17GIT_BASE=${GIT_BASE:-https://git.openstack.org/}
19 18
20install_project() { 19install_project() {
21 local project=$1 20 local project=$1
22 local branch=${2:-$BRANCH_NAME} 21 local branch=${2:-${BRANCH_NAME:-master}}
23 local module_name=${project//-/_} 22 local module_name=${project//-/_}
24 23
25 set +e 24 set +e