x/vmware-nsx
Code Issues Proposed changes

Merge "zuul v3 gate changes"

Browse Source
This commit is contained in:
Jenkins 2017-10-15 21:53:58 +00:00 committed by Gerrit Code Review
commit 1222be4620
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/tox_install_project.sh
View File

@ -20,6 +20,7 @@ shift 2
ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
neutron_installed=$(echo "import ${MOD}" | python 2>/dev/null ; echo $?) neutron_installed=$(echo "import ${MOD}" | python 2>/dev/null ; echo $?)
BRANCH_NAME=master BRANCH_NAME=master
PROJ_DIR=${HOME}/src/git.openstack.org/openstack/${PROJ}
set -e set -e
@ -31,10 +32,14 @@ if [ $CONSTRAINTS_FILE != "unconstrained" ]; then
install_cmd="$install_cmd -c$CONSTRAINTS_FILE" install_cmd="$install_cmd -c$CONSTRAINTS_FILE"
fi fi
if [ $neutron_installed -eq 0 ]; then if [ -d "$PROJ_DIR" ]; then
echo "FOUND code at $PROJ_DIR - using"
$install_cmd -U -e ${PROJ_DIR}
elif [ $neutron_installed -eq 0 ]; then
echo "ALREADY INSTALLED" > /tmp/tox_install-${PROJ}.txt echo "ALREADY INSTALLED" > /tmp/tox_install-${PROJ}.txt
echo "${PROJ} already installed; using existing package" echo "${PROJ} already installed; using existing package"
elif [ -x "$ZUUL_CLONER" ]; then elif [ -x "$ZUUL_CLONER" ]; then
echo "${PROJ} not installed; using zuul cloner"
echo "ZUUL CLONER" > /tmp/tox_install-${PROJ}.txt echo "ZUUL CLONER" > /tmp/tox_install-${PROJ}.txt
cwd=$(/bin/pwd) cwd=$(/bin/pwd)
cd /tmp cd /tmp
@ -47,6 +52,7 @@ elif [ -x "$ZUUL_CLONER" ]; then
$install_cmd -e . $install_cmd -e .
cd "$cwd" cd "$cwd"
else else
echo "${PROJ} not installed; using egg"
echo "PIP HARDCODE" > /tmp/tox_install-${PROJ}.txt echo "PIP HARDCODE" > /tmp/tox_install-${PROJ}.txt
$install_cmd -U -egit+https://git.openstack.org/openstack/${PROJ}@${BRANCH_NAME}#egg=${PROJ} $install_cmd -U -egit+https://git.openstack.org/openstack/${PROJ}@${BRANCH_NAME}#egg=${PROJ}
fi fi