Switch most tests to run on Ubuntu 20.04

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 61290de5fb553b0bf470a7ab1217f091ebb82d0b..8fc5c9ba674e6be9357c4a85ac45ac0498600c57 100644 (file)
--- 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 17d9839f6080f4b134af0ca6785d1d5205c2c6be..74c4269bea3e3a4894722224d8aca3bca459fee7 100644 (file)
--- 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