openstack/octavia-dashboard
Code Issues Proposed changes

Update tox_install.sh for zuulv3

Browse Source 
This patch will allow tox_install.sh to find the zuulv3 checked out version
of horizon.

Change-Id: Ief05fea76d06c4e93eff96de7f7e7a3b3ae3934b
This commit is contained in:
Michael Johnson 2017-10-16 15:38:54 -07:00
parent da1355ac0b
commit 351959b001
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/tox_install.sh
View File

@ -20,6 +20,7 @@ install_project() {
local project=$1 local project=$1
local branch=${2:-$BRANCH_NAME} local branch=${2:-$BRANCH_NAME}
local PROJECT_DIR=$HOME/$project local PROJECT_DIR=$HOME/$project
local ZUULV3_PROJECT_DIR=$HOME/src/git.openstack.org/openstack/$project
set +e set +e
project_installed=$(echo "import $project" | python 2>/dev/null ; echo $?) project_installed=$(echo "import $project" | python 2>/dev/null ; echo $?)
@ -32,7 +33,10 @@ install_project() {
# Note that the functional tests use sudo to run tox and thus # Note that the functional tests use sudo to run tox and thus
# variables used for zuul-cloner to check out the correct version are # variables used for zuul-cloner to check out the correct version are
# lost. # lost.
if [ -d "$PROJECT_DIR" ]; then if [ -d "$ZUULV3_PROJECT_DIR" ]; then
echo "FOUND $project code at $ZUULV3_PROJECT_DIR - using"
$install_cmd -U $ZUULV3_PROJECT_DIR
elif [ -d "$PROJECT_DIR" ]; then
echo "FOUND $project code at $PROJECT_DIR - using" echo "FOUND $project code at $PROJECT_DIR - using"
$install_cmd -U $PROJECT_DIR $install_cmd -U $PROJECT_DIR
elif [ $project_installed -eq 0 ]; then elif [ $project_installed -eq 0 ]; then