summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2017-08-03 15:27:07 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2017-08-03 15:27:07 +0000
commitc2fd4a5c1d230ae826d51601929e716cdc4021c5 (patch)
treeb790e39501abff769d434b2bc1e369f6ff049a36
parent3a0f3ec8105917d647bfd7104f4cf70e37d63fdd (diff)
Updated from OpenStack Ansible Tests
Notes
Notes (review): Code-Review+2: Logan V <logan2211@gmail.com> Code-Review+2: Kevin Carter (cloudnull) <kevin@cloudnull.com> Workflow+1: Kevin Carter (cloudnull) <kevin@cloudnull.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 03 Aug 2017 22:53:53 +0000 Reviewed-on: https://review.openstack.org/490549 Project: openstack/openstack-ansible-os_tacker Branch: refs/heads/master
-rwxr-xr-xrun_tests.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/run_tests.sh b/run_tests.sh
index 969e3db..e8f6f3a 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -35,9 +35,12 @@ source /etc/os-release || source /usr/lib/os-release
35install_pkg_deps() { 35install_pkg_deps() {
36 pkg_deps="git" 36 pkg_deps="git"
37 37
38 # Prefer dnf over yum for CentOS.
39 which dnf &>/dev/null && RHT_PKG_MGR='dnf' || RHT_PKG_MGR='yum'
40
38 case ${ID,,} in 41 case ${ID,,} in
39 *suse*) pkg_mgr_cmd="zypper -n in" ;; 42 *suse*) pkg_mgr_cmd="zypper -n in" ;;
40 centos|rhel) pkg_mgr_cmd="yum install -y" ;; 43 centos|rhel) pkg_mgr_cmd="${RHT_PKG_MGR} install -y" ;;
41 fedora) pkg_mgr_cmd="dnf -y install" ;; 44 fedora) pkg_mgr_cmd="dnf -y install" ;;
42 ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;; 45 ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;;
43 *) echo "unsupported distribution: ${ID,,}"; exit 1 ;; 46 *) echo "unsupported distribution: ${ID,,}"; exit 1 ;;