From d0657add8222cd14809cd00a780f1870ace3a9e2 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Mon, 23 Apr 2018 13:44:28 -0400
Subject: [PATCH] Remove tox_install.sh

Fully removing tox_install.sh as it is no longer needed with zuulv3.

Closes-bug: #1766500
Change-Id: Ic332b54bd5fbc64efc23f1118a8416291ae65df8
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 test-requirements.txt |  9 +++++++
 tools/tox_install.sh  | 55 -------------------------------------------
 tox.ini               |  8 +++----
 3 files changed, 13 insertions(+), 59 deletions(-)
 delete mode 100755 tools/tox_install.sh

diff --git a/test-requirements.txt b/test-requirements.txt
index 1ce2dda0..f91942ef 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -23,3 +23,12 @@ bandit>=1.1.0 # Apache-2.0
 sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
 openstackdocstheme>=1.18.1 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
+
+# Dependencies for each of the optional stores
+oslo.vmware>=2.17.0 # Apache-2.0
+httplib2>=0.9.1 # MIT
+python-swiftclient>=3.2.0 # Apache-2.0
+python-cinderclient>=3.3.0 # Apache-2.0
+os-brick>=2.2.0 # Apache-2.0
+oslo.rootwrap>=5.8.0 # Apache-2.0
+oslo.privsep>=1.23.0 # Apache-2.0
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
deleted file mode 100755
index a074d247..00000000
--- a/tools/tox_install.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-
-# Library constraint file contains version pin that is in conflict with
-# installing the library from source. We should replace 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
-LIB_NAME=glance_store
-requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?)
-
-set -e
-
-CONSTRAINTS_FILE=$1
-shift
-
-install_cmd="pip install"
-mydir=$(mktemp -dt "$LIB_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"
-
-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
-
-# 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 -- $LIB_NAME "-e file://$PWD#egg=$LIB_NAME"
-
-$install_cmd -U $*
-exit $?
diff --git a/tox.ini b/tox.ini
index c0f2ba17..1814832d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,10 +6,10 @@ skipsdist = True
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
 usedevelop = True
-install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} --allow-all-external --allow-insecure netaddr -U {opts} {packages}
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
-       .[vmware,swift,cinder]
+deps =
+   -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+   -r{toxinidir}/requirements.txt
+   -r{toxinidir}/test-requirements.txt
 passenv = OS_TEST_*
 commands = ostestr --slowest {posargs}