Move remaining test to Ubuntu 20.04

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 6bbd811ad161fe7e653d0b80e1db3a7572dbcb38..50c43de4a2b3363724305521923df2af5b81f7b0 100644 (file)
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -103,12 +103,6 @@ jobs:
           - wiki
         os:
           - ubuntu-2004
-        include:
-          - suite: trac
-            os: ubuntu-1804
-        exclude:
-          - suite: trac
-            os: ubuntu-2004
       fail-fast: false
     steps:
     - name: Check out code

diff --git a/.kitchen.yml b/.kitchen.yml
index 58a63e3b9871a41e73e3890723c812dd084a1e1a..35e9ba62d0760869350ac7ec9a4a5e648f41e575 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -18,13 +18,6 @@ verifier:
   sudo: false
 
 platforms:
-  - name: ubuntu-18.04
-    driver:
-      image: dokken/ubuntu-18.04
-      privileged: true
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update -y
   - name: ubuntu-20.04
     driver:
       image: dokken/ubuntu-20.04