From 881df642c867a957ba52929ca573dc848c107b72 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 11 Oct 2022 14:49:24 +0100
Subject: [PATCH] Switch most tests to run on Ubuntu 22.04

---
 .github/workflows/test-kitchen.yml | 15 +++++++++++++--
 .kitchen.yml                       |  7 +++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 4984f3159..76305aaa2 100644
--- 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 a54f1f29d..a86bd7f54 100644
--- 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
-- 
2.39.5