Merge "Use the new copy of tox_install.sh for global constraints support"

tools/tox_install.sh

@@ -1,57 +1,30 @@
 #!/usr/bin/env bash
 
 # Client constraint file contains this client version pin that is in conflict
-# with installing the client from source. We should replace the version pin in
+# with installing the client from source. We should remove the version pin in
 # the constraints file before applying it for from-source installation.
 
-ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
-BRANCH_NAME=master
-CLIENT_NAME=python-monascaclient
-requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?)
+CONSTRAINTS_FILE=$1
+shift 1
 
 set -e
 
-git config --global url.https://git.openstack.org/.insteadOf git://git.openstack.org/
+# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
+# published to logs.openstack.org for easy debugging.
+localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
 
-CONSTRAINTS_FILE=$1
-shift
-
-install_cmd="pip install"
-mydir=$(mktemp -dt "$CLIENT_NAME-tox_install-XXXXXXX")
-trap "rm -rf $mydir" EXIT
-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"
+# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
+curl $CONSTRAINTS_FILE --insecure --progress-bar --output $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
-    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}
-fi
+pip install -c$localfile openstack-requirements
 
 # 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"
+edit-constraints $localfile -- $CLIENT_NAME
 
-$install_cmd -U $*
+pip install -c$localfile -U $*
 exit $?

tox.ini

@@ -4,7 +4,10 @@ minversion = 2.0
 skipsdist = True
 
 [testenv]
-setenv = VIRTUAL_ENV={envdir}
+setenv =
+    VIRTUAL_ENV={envdir}
+    BRANCH_NAME=master
+    CLIENT_NAME=python-monascaclient
 usedevelop = True
 install_command =
     {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}