Drop Ubuntu 20.04 Focal Fossa

Focal-specific ./configure options were moved to Jammy.

(cherry picked from commit 326e19a65ae511df56c8a32c49d011052186774f)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 716d2a7bfbf67403922c676343b956cbf6b4be1c..c5a27153c0e10660cef8346c909d84bf2a637761 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -132,10 +132,6 @@ stages:
 
 # Ubuntu
 
-.ubuntu-focal-amd64: &ubuntu_focal_amd64_image
-  image: "$CI_REGISTRY_IMAGE:ubuntu-focal-amd64"
-  <<: *linux_amd64
-
 .ubuntu-jammy-amd64: &ubuntu_jammy_amd64_image
   image: "$CI_REGISTRY_IMAGE:ubuntu-jammy-amd64"
   <<: *linux_amd64
@@ -755,30 +751,13 @@ system:gcc:tumbleweed:amd64:
     - job: gcc:tumbleweed:amd64
       artifacts: true
 
-# Jobs for regular GCC builds on Ubuntu 20.04 Focal Fossa (amd64)
-
-gcc:focal:amd64:
-  variables:
-    CC: gcc
-    CFLAGS: "${CFLAGS_COMMON} -Og"
-    EXTRA_CONFIGURE: "--with-libidn2 --with-gssapi=/usr --disable-geoip --without-cmocka"
-  <<: *ubuntu_focal_amd64_image
-  <<: *build_job
-
-system:gcc:focal:amd64:
-  <<: *ubuntu_focal_amd64_image
-  <<: *system_test_job
-  needs:
-    - job: gcc:focal:amd64
-      artifacts: true
-
 # Jobs for regular GCC builds on Ubuntu 22.04 Jammy Jellyfish (amd64)
 
 gcc:jammy:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -O2"
-    EXTRA_CONFIGURE: "--with-libidn2 --disable-dnstap --with-gssapi"
+    EXTRA_CONFIGURE: "--with-libidn2 --disable-dnstap --with-gssapi=/usr --disable-geoip --without-cmocka"
   <<: *ubuntu_jammy_amd64_image
   <<: *build_job
 

diff --git a/doc/arm/platforms.rst b/doc/arm/platforms.rst
index 8cff8ff151fcbbbd836ffbee49f798956f458530..bbc34e63be833c294980a1b8427a445bc6d28994 100644 (file)
--- a/doc/arm/platforms.rst
+++ b/doc/arm/platforms.rst
@@ -92,7 +92,7 @@ supported platforms.
 
 -  Platforms past or close to their respective EOL dates, such as:
 
-   -  Ubuntu 14.04, 16.04 (Ubuntu ESM releases are not supported)
+   -  Ubuntu 14.04, 16.04, 18.04, 20.04 (Ubuntu ESM releases are not supported)
    -  Red Hat Enterprise Linux / CentOS / Oracle Linux 6, 7
    -  Debian 8 Jessie, 9 Stretch, 10 Buster
    -  FreeBSD 10.x, 11.x