Switch most tests to run on Ubuntu 22.04

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 4984f315930eaf41f0caed51bd9d4cafdf0958e0..76305aaa2cde46bbe78618c85727a874bad8b7b3 100644 (file)
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -11,7 +11,7 @@ concurrency:
 jobs:
   kitchen:
     name: Test Kitchen
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         suite:
@@ -110,7 +110,17 @@ jobs:
           - wordpress
           - wiki
         os:
-          - ubuntu-2004
+          - ubuntu-2204
+        include:
+          - os: ubuntu-2004
+            suite: mailman
+          - os: ubuntu-2004
+            suite: osqa
+        exclude:
+          - suite: mailman
+            os: ubuntu-2204
+          - suite: osqa
+            os: ubuntu-2204
       fail-fast: false
     steps:
     - name: Check out code
@@ -118,6 +128,7 @@ jobs:
     - name: Setup ruby
       uses: ruby/setup-ruby@v1
       with:
+        ruby-version: 3.1
         bundler-cache: true
     - name: Run kitchen test ${{ matrix.suite }}-${{ matrix.os }}
       run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}

diff --git a/.kitchen.yml b/.kitchen.yml
index a54f1f29de328f7b389652e216879ddeb53294f6..a86bd7f543f8df057034b607fe5a34567af98dc4 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -27,6 +27,13 @@ platforms:
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
+  - name: ubuntu-22.04
+    driver:
+      image: dokken/ubuntu-22.04
+      privileged: true
+      pid_one_command: /bin/systemd
+      intermediate_instructions:
+        - RUN /usr/bin/apt-get update -y
 
 suites:
   - name: accounts