From d5bead54c0c1e9dedb5f8a05b9ce7b291b2bb738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
Date: Tue, 27 Sep 2022 13:59:30 +0200
Subject: [PATCH] Drop Ubuntu 18.04 bionic from the CI

The Ubuntu 18.04 bionic will go EOL in April 2023 before the next stable
BIND 9 release, so we can drop this for the next stable BIND 9 release.
---
 .gitlab-ci.yml            | 35 ++---------------------------------
 doc/arm/platforms.inc.rst |  4 ++--
 2 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b8a37390b..c2b5986df2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -152,10 +152,6 @@ stages:
 
 # Ubuntu
 
-.ubuntu-bionic-amd64: &ubuntu_bionic_amd64_image
-  image: "$CI_REGISTRY_IMAGE:ubuntu-bionic-amd64"
-  <<: *linux_amd64
-
 .ubuntu-focal-amd64: &ubuntu_focal_amd64_image
   image: "$CI_REGISTRY_IMAGE:ubuntu-focal-amd64"
   <<: *linux_amd64
@@ -880,40 +876,13 @@ unit:gcc:tumbleweed:amd64:
     - job: gcc:tumbleweed:amd64
       artifacts: true
 
-# Jobs for regular GCC builds on Ubuntu 18.04 Bionic Beaver (amd64)
-
-gcc:bionic:amd64:
-  variables:
-    CC: gcc
-    CFLAGS: "${CFLAGS_COMMON} -O2"
-    EXTRA_CONFIGURE: "--disable-dnstap --without-cmocka --without-gssapi"
-  <<: *ubuntu_bionic_amd64_image
-  <<: *build_job
-  <<: *api_schedules_tags_triggers_web_triggering_rules
-
-system:gcc:bionic:amd64:
-  <<: *ubuntu_bionic_amd64_image
-  <<: *system_test_job
-  <<: *api_schedules_tags_triggers_web_triggering_rules
-  needs:
-    - job: gcc:bionic:amd64
-      artifacts: true
-
-unit:gcc:bionic:amd64:
-  <<: *ubuntu_bionic_amd64_image
-  <<: *unit_test_job
-  <<: *api_schedules_tags_triggers_web_triggering_rules
-  needs:
-    - job: gcc:bionic: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: "--disable-geoip --with-libidn2"
+    EXTRA_CONFIGURE: "--disable-dnstap --without-cmocka --without-gssapi --with-libidn2"
   <<: *ubuntu_focal_amd64_image
   <<: *build_job
 
@@ -937,7 +906,7 @@ gcc:jammy:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
-    EXTRA_CONFIGURE: "--with-libidn2 --disable-doh"
+    EXTRA_CONFIGURE: "--disable-geoip --with-libidn2 --disable-doh"
   <<: *ubuntu_jammy_amd64_image
   <<: *build_job
 
diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst
index 6351ad9286..9b6b4cb5aa 100644
--- a/doc/arm/platforms.inc.rst
+++ b/doc/arm/platforms.inc.rst
@@ -46,7 +46,7 @@ As of August 2022, current versions of BIND 9 are fully supported and regularly
 following systems:
 
 -  Debian 11
--  Ubuntu LTS 18.04, 20.04, 22.04
+-  Ubuntu LTS 20.04, 22.04
 -  Fedora 36
 -  Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8, 9
 -  FreeBSD 12.3, 13.1
@@ -90,7 +90,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 (Ubuntu ESM releases are not supported)
    -  CentOS 6
    -  Debian 8 Jessie, 9 Stretch, 10 Buster
    -  FreeBSD 10.x, 11.x