Merge "Ubuntu: Use packages to install tempest"
This commit is contained in:
commit
f8d939eacc
13
run_tests.sh
13
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
|
# If openstack/tempest is broken on master, we can pin the repository to a specific commit
|
||||||
# by using the following line:
|
# by using the following line:
|
||||||
export TEMPEST_VERSION=${TEMPEST_VERSION:-'master'}
|
export TEMPEST_VERSION=${TEMPEST_VERSION:-'master'}
|
||||||
# For installing Tempest from RPM keep TEMPEST_FROM_SOURCE to false
|
export TEMPEST_FROM_SOURCE=${TEMPEST_FROM_SOURCE:-true}
|
||||||
# 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
|
|
||||||
# Cirros Image directory
|
# Cirros Image directory
|
||||||
export IMG_DIR=${IMG_DIR:-/tmp/openstack/image}
|
export IMG_DIR=${IMG_DIR:-/tmp/openstack/image}
|
||||||
export CIRROS_VERSION=${CIRROS_VERSION:-0.6.2}
|
export CIRROS_VERSION=${CIRROS_VERSION:-0.6.2}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user