From: Tom Hughes <tom@compton.nu>
Date: Sun, 29 Aug 2021 17:39:13 +0000 (+0100)
Subject: Move remaining test to Ubuntu 20.04
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/17636da518125817ae017751a8d7250aaf964291

Move remaining test to Ubuntu 20.04
---

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 6bbd811ad..50c43de4a 100644
--- 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 58a63e3b9..35e9ba62d 100644
--- 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