Avoid tox-install.sh

Instead of using tox-install.sh, we can install neutron
now directly from pypi - or use the current branch in CI system using
tox-siblings.

Update tox.ini for this change and add neutron to test-requirements.txt
(it's not a requirement of the agent but needed for building).

Change-Id: I2b9817923dd540b47c7341ae4623f4512aa9e14b

test-requirements.txt

@@ -8,6 +8,7 @@ coverage>=3.6 # Apache-2.0
 discover # BSD
 python-subunit>=0.0.18 # Apache-2.0/BSD
 sphinx!=1.2.0,!=1.3b1,>=1.1.2 # BSD
+neutron>=13.0.0.0b1  # Apache-2.0
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0

tools/tox_install.sh

@@ -1,65 +0,0 @@
-#!/usr/bin/env bash
-
-# Many of neutron's repos suffer from the problem of depending on neutron,
-# but it not existing on pypi.
-
-# This wrapper for tox's package installer will use the existing package
-# if it exists, else use zuul-cloner if that program exists, else grab it
-# from neutron master via a hard-coded URL. That last case should only
-# happen with devs running unit tests locally.
-
-# From the tox.ini config page:
-# install_command=ARGV
-# default:
-# pip install {opts} {packages}
-
-ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
-BRANCH_NAME=master
-GIT_BASE=${GIT_BASE:-https://git.openstack.org/}
-
-install_project() {
-    local project=$1
-    local branch=${2:-$BRANCH_NAME}
-    local module_name=${project//-/_}
-
-    set +e
-    project_installed=$(echo "import $module_name" | python 2>/dev/null ; echo $?)
-    set -e
-
-    if [ $project_installed -eq 0 ]; then
-        echo "ALREADY INSTALLED" > /tmp/tox_install.txt
-        echo "$project already installed; using existing package"
-    elif [ -x "$ZUUL_CLONER" ]; then
-        echo "ZUUL CLONER" > /tmp/tox_install.txt
-        # Make this relative to current working directory so that
-        # git clean can remove it. We cannot remove the directory directly
-        # since it is referenced after $install_cmd -e
-        mkdir -p .tmp
-        PROJECT_DIR=$(/bin/mktemp -d -p $(pwd)/.tmp)
-        pushd $PROJECT_DIR
-        $ZUUL_CLONER --cache-dir \
-            /opt/git \
-            --branch $branch \
-            http://git.openstack.org \
-            openstack/$project
-        cd openstack/$project
-        $install_cmd -e .
-        popd
-    else
-        echo "PIP HARDCODE" > /tmp/tox_install.txt
-        local GIT_REPO="$GIT_BASE/openstack/$project"
-        SRC_DIR="$VIRTUAL_ENV/src/$project"
-        git clone --depth 1 --branch $branch $GIT_REPO $SRC_DIR
-        $install_cmd -U -e $SRC_DIR
-    fi
-}
-
-set -e
-
-install_cmd="pip install -c$1"
-shift
-
-install_project neutron
-
-$install_cmd -U $*
-exit $?

tox.ini

@@ -11,8 +11,9 @@ setenv = VIRTUAL_ENV={envdir}
          OS_TEST_PATH=./networking_vpp/tests/unit
 passenv = TRACE_FAILONLY
           PYTHONPATH
-install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
-deps = -r{toxinidir}/requirements.txt
+install_command = pip install {opts} {packages}
+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
        coverage
 commands = stestr run {posargs}