Fix post and periodic jobs

The usage of zuul-cloner in tox_install breaks post and periodic jobs.
Update the script, it does not need to handle unconstrainted installs
anymore (see tox.ini). There's no need to set ZUUL_BRANCH explicitely
- it's set via the environment and branch is passed in as well.

Note that this script is needed for the edit-constraints call, add a
comment.

Change-Id: I0077c986a17d6bb92791474e03d1e77776e9382f
Closes-Bug: #1615430

1 files changed, 33 insertions, 33 deletions

diff --git a/tools/tox_install.sh b/tools/tox_install.sh
index c96b023c..53acc4d5 100755
--- a/tools/tox_install.sh
+++ b/tools/tox_install.sh
@@ -15,41 +15,41 @@ 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
-        CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE
-    fi
-    curl $CONSTRAINTS_FILE -k -o $localfile
-    install_cmd="$install_cmd -c$localfile"
-
-    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}
-        echo "ZUUL CLONER" > /tmp/tox_install.txt
-        pushd $mydir
-        $ZUUL_CLONER --cache-dir \
-            /opt/git \
-            --branch $BRANCH_NAME \
-            git://git.openstack.org \
-            openstack/requirements
-        cd openstack/requirements
-        $install_cmd -e .
-        popd
-    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}
+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"
+
+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
+    # 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 \
+        /opt/git \
+        --branch $BRANCH_NAME \
+        git://git.openstack.org \
+        openstack/requirements
+    cd openstack/requirements
+    $install_cmd -e .
+    popd
+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
-
-    edit-constraints $localfile -- $CLIENT_NAME "-e file://$PWD#egg=$CLIENT_NAME"
+    $install_cmd -U -e ${REQUIREMENTS_PIP_LOCATION}
 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 $?