From af7932136edf332f702c65129bb33f1fa9221008 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Thu, 24 Sep 2020 16:54:38 +0000 Subject: [PATCH] Updated from OpenStack Ansible Tests Change-Id: I161df805f22db1b8d90d4da00c147a59291225e5 --- run_tests.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/run_tests.sh b/run_tests.sh index 3129599c..93e91dde 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -51,13 +51,10 @@ fi # Source distribution information source /etc/os-release || source /usr/lib/os-release -# Prefer dnf over yum for CentOS. -which dnf &>/dev/null && RHT_PKG_MGR='dnf' || RHT_PKG_MGR='yum' - # Figure out the appropriate package install command case ${ID,,} in *suse*) pkg_mgr_cmd="zypper -n in" ;; - centos|rhel|fedora) pkg_mgr_cmd="${RHT_PKG_MGR} install -y" ;; + centos|rhel|fedora) pkg_mgr_cmd="dnf install -y" ;; ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;; # Gentoo needs to have version set since it's rolling gentoo) pkg_mgr_cmd="emerge --jobs=4"; VERSION="rolling" ;;