diff --git a/neutron/tests/api/requirements.txt b/neutron/tests/api/requirements.txt new file mode 100644 index 00000000000..6aae510d74d --- /dev/null +++ b/neutron/tests/api/requirements.txt @@ -0,0 +1,7 @@ +# Additional requirements for api tests + +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. + +tempest>=10.0.0 # Apache-2.0 diff --git a/tools/tox_install.sh b/tools/tox_install.sh index 70357748b97..32145ed28e8 100755 --- a/tools/tox_install.sh +++ b/tools/tox_install.sh @@ -9,10 +9,7 @@ # from neutron master via a hard-coded URL. That last case should only # happen with devs running unit tests locally. -ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner -tempest_installed=$(python -c "import tempest" 2>/dev/null ; echo $?) - -set -e +set -eux install_cmd="pip install" @@ -23,19 +20,4 @@ if [ "$CONSTRAINTS_FILE" != "unconstrained" ]; then install_cmd="$install_cmd -c$CONSTRAINTS_FILE" fi -if [ $tempest_installed -eq 0 ]; then - echo "Tempest already installed; using existing package" -elif [ -x "$ZUUL_CLONER" ]; then - export ZUUL_BRANCH=${ZUUL_BRANCH-$BRANCH} - pushd /tmp - $ZUUL_CLONER --cache-dir \ - /opt/git \ - git://git.openstack.org \ - openstack/tempest - $install_cmd -e openstack/tempest - popd -else - $install_cmd -U -egit+https://git.openstack.org/openstack/tempest#egg=tempest -fi - $install_cmd -U $* diff --git a/tox.ini b/tox.ini index 3ebd364a817..9869cada393 100644 --- a/tox.ini +++ b/tox.ini @@ -24,6 +24,9 @@ setenv = {[testenv]setenv} OS_TEST_PATH=./neutron/tests/api TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc} OS_TEST_API_WITH_REST=1 +deps = + {[testenv]deps} + -r{toxinidir}/neutron/tests/api/requirements.txt [testenv:common] # Fake job to define environment variables shared between dsvm/non-dsvm jobs