From c9b79d0a77d02ccfaa41fe7882b951665b1649f5 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Thu, 12 Dec 2024 12:25:09 +0100
Subject: [PATCH 1/3] Drop Ubuntu 20.04 Focal Fossa

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

(cherry picked from commit 326e19a65ae511df56c8a32c49d011052186774f)
---
 .gitlab-ci.yml            | 32 +-------------------------------
 doc/arm/platforms.inc.rst |  4 ++--
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2cd9e116c1..f8be72676c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -233,10 +233,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
@@ -1214,39 +1210,13 @@ unit: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: "--disable-dnstap --without-cmocka --without-gssapi --with-libidn2"
-  <<: *ubuntu_focal_amd64_image
-  <<: *build_job
-
-system:gcc:focal:amd64:
-  <<: *ubuntu_focal_amd64_image
-  <<: *system_test_job
-  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
-  needs:
-    - job: gcc:focal:amd64
-      artifacts: true
-
-unit:gcc:focal:amd64:
-  <<: *ubuntu_focal_amd64_image
-  <<: *unit_test_job
-  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
-  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}"
-    EXTRA_CONFIGURE: "--disable-geoip --with-libidn2 --disable-doh"
+    EXTRA_CONFIGURE: "--disable-geoip --with-libidn2 --disable-doh --disable-dnstap --without-cmocka --without-gssapi"
   <<: *ubuntu_jammy_amd64_image
   <<: *build_job
 
diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst
index 91b573a134..4f04319a77 100644
--- a/doc/arm/platforms.inc.rst
+++ b/doc/arm/platforms.inc.rst
@@ -44,7 +44,7 @@ Current versions of BIND 9 are fully supported and regularly tested on the
 following systems:
 
 -  Debian 12
--  Ubuntu LTS 20.04, 22.04, 24.04
+-  Ubuntu LTS 22.04, 24.04
 -  Fedora 42
 -  Red Hat Enterprise Linux / CentOS / Oracle Linux 8, 9
 -  FreeBSD 13.4, 14.2
@@ -87,7 +87,7 @@ supported platforms.
 
 -  Platforms past or close to their respective EOL dates, such as:
 
-   -  Ubuntu 14.04, 16.04, 18.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, 11 Bullseye
    -  FreeBSD 10.x, 11.x

From 37cd7daf130af1db796810279d6cfceaa5d279ba Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Thu, 12 Dec 2024 12:27:09 +0100
Subject: [PATCH 2/3] Make FreeBSD 12.x part of Community-Maintained platforms

(cherry picked from commit ff39441874fd234ac03567d04d8f3dad0f777b1d)
---
 doc/arm/platforms.inc.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst
index 4f04319a77..66c2376290 100644
--- a/doc/arm/platforms.inc.rst
+++ b/doc/arm/platforms.inc.rst
@@ -90,7 +90,7 @@ supported platforms.
    -  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, 11 Bullseye
-   -  FreeBSD 10.x, 11.x
+   -  FreeBSD 10.x, 11.x, 12.x
 
 -  Less common CPU architectures (i386, i686, mips, mipsel, sparc, ppc, and others)
 

From 3682ccecb55560da0bfef29426a65e027280cfd2 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Tue, 13 May 2025 17:03:21 +0200
Subject: [PATCH 3/3] Revert "Ignore .hypothesis files created by system tests"

This reverts commit f413ddbe5f2edfdeedc41603dcd2afe105ed2844.

(cherry picked from commit 84c565878eaad5be9775c2569dcb51e262f19c11)
---
 bin/tests/system/conftest.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/tests/system/conftest.py b/bin/tests/system/conftest.py
index 2c80777640..0abc30df86 100644
--- a/bin/tests/system/conftest.py
+++ b/bin/tests/system/conftest.py
@@ -308,7 +308,6 @@ def logger(request, system_test_name):
 @pytest.fixture(scope="module")
 def expected_artifacts(request):
     common_artifacts = [
-        "*/.hypothesis",  # drop after Ubuntu 20.04 Focal Fossa gets removed from CI
         ".libs/*",  # possible build artifacts, see GL #5055
         "ns*/named.conf",
         "ns*/named.memstats",