Browse Source

Merge "Updated from OpenStack Ansible Tests"

Zuul 5 days ago
parent
commit
e3d4f6614b
2 changed files with 7 additions and 3 deletions
  1. 5
    2
      bindep.txt
  2. 2
    1
      run_tests.sh

+ 5
- 2
bindep.txt View File

@@ -26,7 +26,7 @@
26 26
 gcc
27 27
 
28 28
 # Base requirements for Ubuntu
29
-git-core          [platform:dpkg]
29
+git-core          [platform:dpkg platform:suse]
30 30
 libssl-dev        [platform:dpkg]
31 31
 libffi-dev        [platform:dpkg]
32 32
 python2.7         [platform:dpkg]
@@ -38,12 +38,15 @@ python3-dev       [platform:dpkg]
38 38
 
39 39
 # Base requirements for RPM distros
40 40
 gcc-c++           [platform:rpm]
41
-git               [platform:rpm]
41
+git               [platform:rpm !platform:suse]
42 42
 libffi-devel      [platform:rpm]
43 43
 openssl-devel     [platform:rpm]
44 44
 python-devel      [platform:rpm]
45 45
 python2-dnf       [platform:fedora]
46 46
 
47
+# Base requirements for Gentoo
48
+git               [platform:gentoo]
49
+
47 50
 # For SELinux
48 51
 libselinux-python [platform:redhat]
49 52
 libsemanage-python [platform:redhat]

+ 2
- 1
run_tests.sh View File

@@ -59,7 +59,8 @@ case ${ID,,} in
59 59
     *suse*) pkg_mgr_cmd="zypper -n in" ;;
60 60
     centos|rhel|fedora) pkg_mgr_cmd="${RHT_PKG_MGR} install -y" ;;
61 61
     ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;;
62
-    gentoo) pkg_mgr_cmd="emerge" ;;
62
+    # Gentoo needs to have version set since it's rolling
63
+    gentoo) pkg_mgr_cmd="emerge --jobs=4"; VERSION="rolling" ;;
63 64
     *) echo "unsupported distribution: ${ID,,}"; exit 1 ;;
64 65
 esac
65 66
 

Loading…
Cancel
Save