From 08d647102f7577d23d947ff95b469bf1d3232833 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tomas@tbabej.com>
Date: Sun, 24 Jul 2022 13:32:23 -0400
Subject: [PATCH] tests: Remove Ubuntu 21.04 and 21.10 from the test matrix

Both releases are beyond their respective EoL [1].

[1]: https://wiki.ubuntu.com/Releases
---
 .github/workflows/tests.yaml |  6 ------
 docker-compose.yml           | 16 ----------------
 test/docker/ubuntu2104       | 27 ---------------------------
 test/docker/ubuntu2110       | 27 ---------------------------
 4 files changed, 76 deletions(-)
 delete mode 100644 test/docker/ubuntu2104
 delete mode 100644 test/docker/ubuntu2110

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index d853556fa..293a6ba63 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -30,12 +30,6 @@ jobs:
           - name: "Ubuntu 20.04"
             runner: ubuntu-latest
             dockerfile: ubuntu2004
-          - name: "Ubuntu 21.04"
-            runner: ubuntu-latest
-            dockerfile: ubuntu2104
-          - name: "Ubuntu 21.10"
-            runner: ubuntu-latest
-            dockerfile: ubuntu2110
           - name: "OpenSUSE 15"
             runner: ubuntu-latest
             dockerfile: opensuse15
diff --git a/docker-compose.yml b/docker-compose.yml
index eafb2331d..045d4512a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -64,22 +64,6 @@ services:
     security_opt:
       - label=type:container_runtime_t
     tty: true
-  test-ubuntu2104:
-    build:
-        context: .
-        dockerfile: test/docker/ubuntu2104
-    network_mode: "host"
-    security_opt:
-      - label=type:container_runtime_t
-    tty: true
-  test-ubuntu2110:
-    build:
-        context: .
-        dockerfile: test/docker/ubuntu2110
-    network_mode: "host"
-    security_opt:
-      - label=type:container_runtime_t
-    tty: true
   test-debianstable:
     build:
         context: .
diff --git a/test/docker/ubuntu2104 b/test/docker/ubuntu2104
deleted file mode 100644
index 40130d681..000000000
--- a/test/docker/ubuntu2104
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM ubuntu:21.04
-
-RUN apt-get update
-RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y build-essential cmake git uuid-dev libgnutls28-dev faketime locales python3
-
-# Setup language environment
-RUN locale-gen en_US.UTF-8
-ENV LC_ALL en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US.UTF-8
-
-# Setup taskwarrior
-ADD . /root/code/
-WORKDIR /root/code/
-RUN git clean -dfx
-RUN git submodule init
-RUN git submodule update
-RUN cmake -DCMAKE_BUILD_TYPE=debug .
-RUN make -j8
-RUN make install
-RUN task --version
-
-# Setup tests
-WORKDIR /root/code/test/
-RUN make -j8
-
-CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]
diff --git a/test/docker/ubuntu2110 b/test/docker/ubuntu2110
deleted file mode 100644
index b6143fdd7..000000000
--- a/test/docker/ubuntu2110
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM ubuntu:21.10
-
-RUN apt-get update
-RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y build-essential cmake git uuid-dev libgnutls28-dev faketime locales python3
-
-# Setup language environment
-RUN locale-gen en_US.UTF-8
-ENV LC_ALL en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US.UTF-8
-
-# Setup taskwarrior
-ADD . /root/code/
-WORKDIR /root/code/
-RUN git clean -dfx
-RUN git submodule init
-RUN git submodule update
-RUN cmake -DCMAKE_BUILD_TYPE=debug .
-RUN make -j8
-RUN make install
-RUN task --version
-
-# Setup tests
-WORKDIR /root/code/test/
-RUN make -j8
-
-CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]