diff --git a/run_tests.sh b/run_tests.sh index 455a9cbe4..0d4b33ebe 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -46,17 +46,8 @@ export PUPPET_ARGS="${PUPPET_ARGS} --detailed-exitcodes --color=false --test --s # If openstack/tempest is broken on master, we can pin the repository to a specific commit # by using the following line: export TEMPEST_VERSION=${TEMPEST_VERSION:-'master'} -# For installing Tempest from RPM keep TEMPEST_FROM_SOURCE to false -# In Ubuntu, Tempest packages are not maintained so installing from source -if is_fedora; then - export TEMPEST_FROM_SOURCE=${TEMPEST_FROM_SOURCE:-false} -else - if [ $(lsb_release --id -s) = "Ubuntu" ]; then - export TEMPEST_FROM_SOURCE=${TEMPEST_FROM_SOURCE:-true} - else - export TEMPEST_FROM_SOURCE=${TEMPEST_FROM_SOURCE:-false} - fi -fi +export TEMPEST_FROM_SOURCE=${TEMPEST_FROM_SOURCE:-true} + # Cirros Image directory export IMG_DIR=${IMG_DIR:-/tmp/openstack/image} export CIRROS_VERSION=${CIRROS_VERSION:-0.6.2}