Matthew Thode 6 months ago
parent
commit
63dbdfe819
No account linked to committer's email address
6 changed files with 44 additions and 2 deletions
  1. 3
    0
      bindep.txt
  2. 2
    1
      run_tests.sh
  3. 2
    1
      run_tests_common.sh
  4. 8
    0
      test-log-collect.sh
  5. 17
    0
      zuul.d/jobs.yaml
  6. 12
    0
      zuul.d/project-templates.yaml

+ 3
- 0
bindep.txt View File

@@ -44,6 +44,9 @@ 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
 

+ 2
- 1
run_tests_common.sh View File

@@ -61,7 +61,8 @@ case "${ID,,}" in
61 61
         sudo apt-get update
62 62
         ;;
63 63
     gentoo)
64
-        sudo emaint-sync -A
64
+        pkg_list="app-misc/ca-certificates sys-apps/lsb-release dev-python/pyopenssl"
65
+        sudo emerge-webrsync
65 66
         ;;
66 67
     *)
67 68
         echo "Unsupported distribution: ${ID,,}"

+ 8
- 0
test-log-collect.sh View File

@@ -113,7 +113,15 @@ function repo_information {
113 113
     elif eval sudo ${lxc_cmd} which apt-get &> /dev/null; then
114 114
         eval sudo ${lxc_cmd} apt-cache policy | grep http | awk '{print $1" "$2" "$3}' | sort -u > "${WORKING_DIR}/logs/ubuntu-apt-repolist-${1}.txt" || true
115 115
         eval sudo ${lxc_cmd} apt list --installed > "${WORKING_DIR}/logs/ubuntu-apt-list-installed-${1}.txt" || true
116
+
117
+    # Gentoo package debugging
118
+    elif eval sudo ${lxc_cmd} which emerge &> /dev/null; then
119
+        # list installed packages
120
+        eval sudo ${lxc_cmd} equery list "*" > "${WORKING_DIR}/logs/gentoo-portage-list-installed-${1}.txt" || true
121
+        # list only packages called for install (not dependancies)
122
+        eval sudo ${lxc_cmd} cat /var/lib/portage/world > "${WORKING_DIR}/logs/gentoo-portage-list-manual-installed-${1}.txt" || true
116 123
     fi
124
+
117 125
 }
118 126
 
119 127
 function store_artifacts {

+ 17
- 0
zuul.d/jobs.yaml View File

@@ -184,6 +184,23 @@
184 184
     vars:
185 185
       tox_env: distro_install
186 186
 
187
+- job:
188
+    name: openstack-ansible-upgrade-gentoo-17-0-systemd
189
+    parent: openstack-ansible-upgrade
190
+    nodeset: gentoo-17-0-systemd
191
+
192
+- job:
193
+    name: openstack-ansible-functional-gentoo-17-0-systemd
194
+    parent: openstack-ansible-functional
195
+    nodeset: gentoo-17-0-systemd
196
+
197
+- job:
198
+    name: openstack-ansible-functional-distro_install-gentoo-17-0-systemd
199
+    parent: openstack-ansible-functional
200
+    nodeset: gentoo-17-0-systemd
201
+    vars:
202
+      tox_env: distro_install
203
+
187 204
 - job:
188 205
     name: openstack-ansible-functional-centos-7
189 206
     parent: openstack-ansible-functional

+ 12
- 0
zuul.d/project-templates.yaml View File

@@ -9,12 +9,16 @@
9 9
             voting: false
10 10
         - openstack-ansible-functional-opensuse-423:
11 11
             voting: false
12
+        - openstack-ansible-functional-gentoo-17-0-systemd:
13
+            voting: false
12 14
         - openstack-ansible-functional-ubuntu-bionic
13 15
     gate:
14 16
       jobs:
15 17
         - openstack-ansible-linters
16 18
         - openstack-ansible-functional-centos-7
17 19
         # - openstack-ansible-functional-opensuse-423
20
+        - openstack-ansible-functional-gentoo-17-0-systemd:
21
+            voting: false
18 22
         - openstack-ansible-functional-ubuntu-bionic
19 23
     experimental:
20 24
       jobs:
@@ -29,6 +33,8 @@
29 33
         - openstack-ansible-upgrade-opensuse-150:
30 34
             voting: false
31 35
         - openstack-ansible-upgrade-opensuse-423
36
+        - openstack-ansible-upgrade-gentoo-17-0-systemd:
37
+            voting: false
32 38
         # TODO(mnaser): Make this voting once we release Rocky
33 39
         - openstack-ansible-upgrade-ubuntu-bionic:
34 40
             voting: false
@@ -37,6 +43,8 @@
37 43
       jobs:
38 44
         - openstack-ansible-upgrade-centos-7
39 45
         # - openstack-ansible-upgrade-opensuse-423
46
+        - openstack-ansible-upgrade-gentoo-17-0-systemd:
47
+            voting: false
40 48
         - openstack-ansible-upgrade-ubuntu-xenial
41 49
 
42 50
 - project-template:
@@ -51,8 +59,12 @@
51 59
             voting: false
52 60
         - openstack-ansible-functional-distro_install-opensuse-423:
53 61
             voting: false
62
+        - openstack-ansible-functional-distro_install-gentoo-17-0-systemd:
63
+            voting: false
54 64
         - openstack-ansible-functional-distro_install-ubuntu-bionic:
55 65
             voting: false
56 66
     gate:
57 67
       jobs:
58 68
         - openstack-ansible-functional-distro_install-centos-7
69
+        - openstack-ansible-functional-distro_install-gentoo-17-0-systemd:
70
+            voting: false

Loading…
Cancel
Save