test

signalfx · Jun 18, 2024 · dad6526 · dad6526
1 parent 2de401f
commit dad6526
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 36 deletions.
diff --git a/.github/workflows/chef-test.yml b/.github/workflows/chef-test.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - main
+      - chef-kitchen-tests
     paths:
       - '.github/workflows/chef-test.yml'
       - 'deployments/chef/**'
@@ -25,6 +26,9 @@ defaults:
   run:
     working-directory: 'deployments/chef'
 
+env:
+  CHEF_VERSION: "22.12.1024"
+
 jobs:
   chef-lint-spec-test:
     name: chef-lint-spec-test
@@ -89,7 +93,12 @@ jobs:
       - name: Install chef
         uses: actionshub/[email protected]
         with:
-          version: 21.12.720
+          version: ${{ env.CHEF_VERSION }}
+
+      - name: Update kitchen-dokken
+        run: |
+          chef env --chef-license accept
+          chef gem install kitchen-dokken -v 2.20.4
 
       - run: kitchen test ${{ matrix.DISTRO }}
 
@@ -112,7 +121,7 @@ jobs:
       - name: Install chef
         uses: actionshub/[email protected]
         with:
-          version: 21.12.720
+          version: ${{ env.CHEF_VERSION }}
 
       - name: Install kitchen-docker
         run: |

diff --git a/deployments/chef/kitchen.yml b/deployments/chef/kitchen.yml
@@ -3,6 +3,9 @@ driver:
   name: dokken
   chef_license: accept
   privileged: true
+  cgroupns_host: true
+  volumes:
+    - /sys/fs/cgroup:/sys/fs/cgroup:rw
 
 transport:
   name: dokken
@@ -22,43 +25,31 @@ platforms:
     driver:
       image: dokken/amazonlinux-2
       pid_one_command: /usr/lib/systemd/systemd
-      volumes:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
   - name: centos-7
     driver:
       image: dokken/centos-7
       pid_one_command: /usr/lib/systemd/systemd
-      volumes:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
   - name: centos-8
     driver:
       image: dokken/centos-8
       pid_one_command: /usr/lib/systemd/systemd
-      volumes:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
   - name: centos-9
     driver:
       image: dokken/centos-stream-9
       pid_one_command: /usr/lib/systemd/systemd
-      volumes:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
   - name: rockylinux-8
     driver:
       image: dokken/rockylinux-8
       pid_one_command: /usr/lib/systemd/systemd
-      volumes:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
   - name: rockylinux-9
     driver:
       image: dokken/rockylinux-9
       pid_one_command: /usr/lib/systemd/systemd
-      volumes:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
   - name: debian-9
     driver:
@@ -67,29 +58,21 @@ platforms:
         RUN sed -i 's|http://.*.debian.org|http://archive.debian.org|' /etc/apt/sources.list
         RUN sed -i '/stretch-updates/d' /etc/apt/sources.list
       pid_one_command: /bin/systemd
-      volumes:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
   - name: debian-10
     driver:
       image: dokken/debian-10
       pid_one_command: /bin/systemd
-      volumes:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
   - name: debian-11
     driver:
       image: dokken/debian-11
       pid_one_command: /bin/systemd
-      volumes:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
   - name: debian-12
     driver:
       image: dokken/debian-12
       pid_one_command: /bin/systemd
-      volumes:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
   - name: opensuse-12
     driver:
@@ -109,50 +92,36 @@ platforms:
             rm -f /usr/lib/systemd/system/anaconda.target.wants/*;
         ENV init /sbin/init
       pid_one_command: /sbin/init
-      volumes:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
   - name: opensuse-15
     driver:
       image: dokken/opensuse-leap-15
       pid_one_command: /usr/lib/systemd/systemd
-      volumes:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
   - name: oraclelinux-7
     driver:
       image: dokken/oraclelinux-7
       pid_one_command: /usr/lib/systemd/systemd
-      volumes:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
   - name: oraclelinux-8
     driver:
       image: dokken/oraclelinux-8
       pid_one_command: /usr/lib/systemd/systemd
-      volumes:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
   - name: ubuntu-18.04
     driver:
       image: dokken/ubuntu-18.04
       pid_one_command: /bin/systemd
-      volumes:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
   - name: ubuntu-20.04
     driver:
       image: dokken/ubuntu-20.04
       pid_one_command: /bin/systemd
-      volumes:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
   - name: ubuntu-22.04
     driver:
       image: dokken/ubuntu-22.04
       pid_one_command: /bin/systemd
-      volumes:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
 suites:
   - name: default