diff --git a/test-requirements.txt b/test-requirements.txt index ce50339c2..9c83c186f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -23,7 +23,6 @@ testscenarios>=0.4 # Apache-2.0/BSD WebTest>=2.0 # MIT oslotest>=1.10.0 # Apache-2.0 os-testr>=0.4.1 # Apache-2.0 -tempest-lib>=0.13.0 # Apache-2.0 ddt>=1.0.1 # MIT pylint==1.4.5 # GNU GPL v2 reno>=0.1.1 # Apache2 diff --git a/tools/tox_install.sh b/tools/tox_install.sh index 70357748b..7bc00c509 100755 --- a/tools/tox_install.sh +++ b/tools/tox_install.sh @@ -23,19 +23,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 $*