openstack/openstack-ansible-ops
Code Issues Proposed changes

Merge "Updated from OpenStack Ansible Tests"

Browse Source
This commit is contained in:
Zuul 2019-04-17 19:26:57 +00:00 committed by Gerrit Code Review
commit 6819543c7c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bindep.txt
View File

@ -26,7 +26,7 @@
gcc gcc
# Base requirements for Ubuntu # Base requirements for Ubuntu
git-core [platform:dpkg] git-core [platform:dpkg platform:suse]
libssl-dev [platform:dpkg] libssl-dev [platform:dpkg]
libffi-dev [platform:dpkg] libffi-dev [platform:dpkg]
python2.7 [platform:dpkg] python2.7 [platform:dpkg]
@ -38,12 +38,15 @@ python3-dev [platform:dpkg]
# Base requirements for RPM distros # Base requirements for RPM distros
gcc-c++ [platform:rpm] gcc-c++ [platform:rpm]
git [platform:rpm] git [platform:rpm !platform:suse]
libffi-devel [platform:rpm] libffi-devel [platform:rpm]
openssl-devel [platform:rpm] openssl-devel [platform:rpm]
python-devel [platform:rpm] python-devel [platform:rpm]
python2-dnf [platform:fedora] python2-dnf [platform:fedora]
# Base requirements for Gentoo
git [platform:gentoo]
# For SELinux # For SELinux
libselinux-python [platform:redhat] libselinux-python [platform:redhat]
libsemanage-python [platform:redhat] libsemanage-python [platform:redhat]

3
run_tests.sh
View File

@ -59,7 +59,8 @@ case ${ID,,} in
*suse*) pkg_mgr_cmd="zypper -n 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="${RHT_PKG_MGR} install -y" ;;
ubuntu|debian) pkg_mgr_cmd="apt-get 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 ;; *) echo "unsupported distribution: ${ID,,}"; exit 1 ;;
esac esac