From 21703a6dfdfd94366db7959ab34f3b9d47b705b7 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Fri, 22 Mar 2019 22:04:04 +0000 Subject: [PATCH] Updated from OpenStack Ansible Tests Change-Id: I92d48d8f5c47d0101fcd0c7dc4100bee59432885 --- bindep.txt | 7 +++++-- run_tests.sh | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bindep.txt b/bindep.txt index 5a05c5a4..c648fb1c 100644 --- a/bindep.txt +++ b/bindep.txt @@ -26,7 +26,7 @@ gcc # Base requirements for Ubuntu -git-core [platform:dpkg] +git-core [platform:dpkg platform:suse] libssl-dev [platform:dpkg] libffi-dev [platform:dpkg] python2.7 [platform:dpkg] @@ -38,12 +38,15 @@ python3-dev [platform:dpkg] # Base requirements for RPM distros gcc-c++ [platform:rpm] -git [platform:rpm] +git [platform:rpm !platform:suse] libffi-devel [platform:rpm] openssl-devel [platform:rpm] python-devel [platform:rpm] python2-dnf [platform:fedora] +# Base requirements for Gentoo +git [platform:gentoo] + # For SELinux libselinux-python [platform:redhat] libsemanage-python [platform:redhat] diff --git a/run_tests.sh b/run_tests.sh index cbffb04a..5f21989f 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -59,7 +59,8 @@ case ${ID,,} in *suse*) pkg_mgr_cmd="zypper -n in" ;; centos|rhel|fedora) pkg_mgr_cmd="${RHT_PKG_MGR} install -y" ;; ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;; - gentoo) pkg_mgr_cmd="emerge" ;; + # Gentoo needs to have version set since it's rolling + gentoo) pkg_mgr_cmd="emerge --jobs=4"; VERSION="rolling" ;; *) echo "unsupported distribution: ${ID,,}"; exit 1 ;; esac