diff --git a/tools/tox_install_project.sh b/tools/tox_install_project.sh index e95dd836a2..48a9599794 100755 --- a/tools/tox_install_project.sh +++ b/tools/tox_install_project.sh @@ -20,6 +20,7 @@ shift 2 ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner neutron_installed=$(echo "import ${MOD}" | python 2>/dev/null ; echo $?) BRANCH_NAME=master +PROJ_DIR=${HOME}/src/git.openstack.org/openstack/${PROJ} set -e @@ -31,10 +32,14 @@ if [ $CONSTRAINTS_FILE != "unconstrained" ]; then install_cmd="$install_cmd -c$CONSTRAINTS_FILE" 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 "${PROJ} already installed; using existing package" elif [ -x "$ZUUL_CLONER" ]; then + echo "${PROJ} not installed; using zuul cloner" echo "ZUUL CLONER" > /tmp/tox_install-${PROJ}.txt cwd=$(/bin/pwd) cd /tmp @@ -47,6 +52,7 @@ elif [ -x "$ZUUL_CLONER" ]; then $install_cmd -e . cd "$cwd" else + echo "${PROJ} not installed; using egg" echo "PIP HARDCODE" > /tmp/tox_install-${PROJ}.txt $install_cmd -U -egit+https://git.openstack.org/openstack/${PROJ}@${BRANCH_NAME}#egg=${PROJ} fi