From 85f3a7a5203d1a3823a659cb0389149c946ecdb9 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 17 Nov 2023 00:42:01 +0900 Subject: [PATCH] Revert "Ubuntu: Use packages to install tempest" This reverts commit 9bdb8fc1f59601d63272c7a136c9bde830187d4e. Reason for revert: This change switched package installation source to upstream source in fact. Some of the plugin tests are still failing during the attempt to re-swtich the installation source to distro packages so it's better to keep using source installation for Ubuntu now. Change-Id: Icffbf68ce37730ead26758f8c48b3d49b3011fb2 --- run_tests.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/run_tests.sh b/run_tests.sh index 0d4b33ebe..455a9cbe4 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -46,8 +46,17 @@ 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'} -export TEMPEST_FROM_SOURCE=${TEMPEST_FROM_SOURCE:-true} - +# 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 # Cirros Image directory export IMG_DIR=${IMG_DIR:-/tmp/openstack/image} export CIRROS_VERSION=${CIRROS_VERSION:-0.6.2}