Merge "Fix post and periodic jobs"

tools/tox_install.sh

@@ -15,21 +15,19 @@ CONSTRAINTS_FILE=$1
 shift
 
 install_cmd="pip install"
-if [ $CONSTRAINTS_FILE != "unconstrained" ]; then
-
-    mydir=$(mktemp -dt "$CLIENT_NAME-tox_install-XXXXXXX")
-    localfile=$mydir/upper-constraints.txt
-    if [[ $CONSTRAINTS_FILE != http* ]]; then
+mydir=$(mktemp -dt "$CLIENT_NAME-tox_install-XXXXXXX")
+localfile=$mydir/upper-constraints.txt
+if [[ $CONSTRAINTS_FILE != http* ]]; then
     CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE
-    fi
-    curl $CONSTRAINTS_FILE -k -o $localfile
-    install_cmd="$install_cmd -c$localfile"
+fi
+curl $CONSTRAINTS_FILE -k -o $localfile
+install_cmd="$install_cmd -c$localfile"
 
-    if [ $requirements_installed -eq 0 ]; then
+if [ $requirements_installed -eq 0 ]; then
     echo "ALREADY INSTALLED" > /tmp/tox_install.txt
     echo "Requirements already installed; using existing package"
-    elif [ -x "$ZUUL_CLONER" ]; then
-        export ZUUL_BRANCH=${ZUUL_BRANCH-$BRANCH}
+elif [ -x "$ZUUL_CLONER" ]; then
+    # If this is called in a periodic job, these will not be set
     echo "ZUUL CLONER" > /tmp/tox_install.txt
     pushd $mydir
     $ZUUL_CLONER --cache-dir \
@@ -40,16 +38,18 @@ if [ $CONSTRAINTS_FILE != "unconstrained" ]; then
     cd openstack/requirements
     $install_cmd -e .
     popd
-    else
+else
     echo "PIP HARDCODE" > /tmp/tox_install.txt
     if [ -z "$REQUIREMENTS_PIP_LOCATION" ]; then
         REQUIREMENTS_PIP_LOCATION="git+https://git.openstack.org/openstack/requirements@$BRANCH_NAME#egg=requirements"
     fi
     $install_cmd -U -e ${REQUIREMENTS_PIP_LOCATION}
-    fi
-
-    edit-constraints $localfile -- $CLIENT_NAME "-e file://$PWD#egg=$CLIENT_NAME"
 fi
 
+# This is the main purpose of the script: Allow local installation of
+# the current repo. It is listed in constraints file and thus any
+# install will be constrained and we need to unconstrain it.
+edit-constraints $localfile -- $CLIENT_NAME "-e file://$PWD#egg=$CLIENT_NAME"
+
 $install_cmd -U $*
 exit $?