From 590838d87d906d33b8cda36c37b3646430538509 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sat, 16 May 2020 17:23:53 +0100
Subject: [PATCH] Switch most tests to run on Ubuntu 20.04

---
 .github/workflows/test-kitchen.yml | 12 +++++++++++-
 .kitchen.yml                       |  7 +++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 61290de5f..8fc5c9ba6 100644
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -100,7 +100,17 @@ jobs:
           - wordpress
           - wiki
         os:
-          - ubuntu-1804
+          - ubuntu-2004
+        include:
+          - os: ubuntu-1804
+            suite: osqa
+          - os: ubuntu-1804
+            suite: trac
+        exclude:
+          - suite: osqa
+            os: ubuntu-2004
+          - suite: trac
+            os: ubuntu-2004
       fail-fast: false
     steps:
     - name: Check out code
diff --git a/.kitchen.yml b/.kitchen.yml
index 17d9839f6..74c4269be 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -25,6 +25,13 @@ platforms:
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
+  - name: ubuntu-20.04
+    driver:
+      image: dokken/ubuntu-20.04
+      privileged: true
+      pid_one_command: /bin/systemd
+      intermediate_instructions:
+        - RUN /usr/bin/apt-get update -y
 
 suites:
   - name: accounts
-- 
2.39.5