From: Michal Nowak <mnowak@isc.org>
Date: Tue, 28 Jul 2026 08:47:41 +0000 (+0200)
Subject: Drop FreeBSD 13 support
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=124eb33c1754b907b3056b587d3c930bafa337c7;p=thirdparty%2Fbind9.git

Drop FreeBSD 13 support

FreeBSD 13 has reached its end of life, so stop testing on it: remove
the CI build, system test, and unit test jobs together with the runner
tag anchor they used, and move the release from the regularly tested
platforms to the best-effort list in the ARM.

The is_host_freebsd_13 helper existed solely to grant one rerun to two
tests that were flaky on that release, so it goes away with them.

Assisted-by: Claude:claude-opus-5[1m]
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a13a0681c24..3fbf77b6b6b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -167,15 +167,6 @@ stages:
     - runner-manager
     - aarch64
 
-.freebsd-autoscaler-13-amd64-tags: &freebsd_autoscaler_13_amd64_tags
-  tags:
-    - amd64
-    - autoscaler
-    - aws
-    - bsd-stress-test-1
-    - shell
-    - stress-test
-
 .freebsd-autoscaler-14-amd64-tags: &freebsd_autoscaler_14_amd64_tags
   tags:
     - amd64
@@ -1810,39 +1801,6 @@ unit:clang:trixie:amd64:
     - job: clang:trixie:amd64
       artifacts: true
 
-# Jobs for Clang builds on FreeBSD 13 (amd64)
-
-clang:freebsd13:amd64:
-  variables:
-    CC: clang
-    CFLAGS: "${CFLAGS_COMMON}"
-    GIT_CLONE_PATH: "${GIT_CLONE_PATH_INSTANCE_EXECUTOR}"
-    # Use MIT Kerberos5 for BIND 9 GSS-API support because of FreeBSD Heimdal
-    # incompatibility; see https://bugs.freebsd.org/275241.
-    EXTRA_CONFIGURE: "${WITH_LIBEDIT} -Doptimization=g --native-file ci/freebsd.ini"
-  <<: *build_job
-  <<: *freebsd_autoscaler_13_amd64_tags
-
-system:clang:freebsd13:amd64:
-  variables:
-    GIT_CLONE_PATH: "${GIT_CLONE_PATH_INSTANCE_EXECUTOR}"
-  needs:
-    - job: clang:freebsd13:amd64
-      artifacts: true
-  <<: *system_test_job
-  <<: *freebsd_autoscaler_13_amd64_tags
-  <<: *extra_system_tests_triggering_rules
-
-unit:clang:freebsd13:amd64:
-  variables:
-    GIT_CLONE_PATH: "${GIT_CLONE_PATH_INSTANCE_EXECUTOR}"
-  needs:
-    - job: clang:freebsd13:amd64
-      artifacts: true
-  <<: *unit_test_job
-  <<: *freebsd_autoscaler_13_amd64_tags
-  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
-
 # Jobs for Clang builds on FreeBSD 14 (amd64)
 
 clang:freebsd14:amd64:
diff --git a/bin/tests/system/dnstap/tests_sh_dnstap.py b/bin/tests/system/dnstap/tests_sh_dnstap.py
index 8fef97a47e7..10d9a4111b2 100644
--- a/bin/tests/system/dnstap/tests_sh_dnstap.py
+++ b/bin/tests/system/dnstap/tests_sh_dnstap.py
@@ -31,6 +31,5 @@ pytestmark = [
 ]
 
 
-@pytest.mark.flaky(max_runs=2, rerun_filter=isctest.mark.is_host_freebsd_13)
 def test_dnstap(run_tests_sh):
     run_tests_sh()
diff --git a/bin/tests/system/isctest/mark.py b/bin/tests/system/isctest/mark.py
index 5b62697f1fe..3492ee21f9f 100644
--- a/bin/tests/system/isctest/mark.py
+++ b/bin/tests/system/isctest/mark.py
@@ -74,10 +74,6 @@ def is_host_freebsd(*_):
     return platform.system() == "FreeBSD"
 
 
-def is_host_freebsd_13(*_):
-    return platform.system() == "FreeBSD" and platform.release().startswith("13")
-
-
 def with_algorithm(name: str):
     key = f"{name}_SUPPORTED"
     assert key in os.environ, f"{key} env variable undefined"
diff --git a/bin/tests/system/timeouts/tests_tcp_timeouts.py b/bin/tests/system/timeouts/tests_tcp_timeouts.py
index 3443b381404..c1334f52036 100644
--- a/bin/tests/system/timeouts/tests_tcp_timeouts.py
+++ b/bin/tests/system/timeouts/tests_tcp_timeouts.py
@@ -64,7 +64,6 @@ def test_initial_timeout(named_port):
                 raise EOFError from e
 
 
-@pytest.mark.flaky(max_runs=2, rerun_filter=isctest.mark.is_host_freebsd_13)
 def test_idle_timeout(named_port):
     #
     # The idle timeout is 5 seconds, so the third message should fail
diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst
index 1cc2ee919e2..8076f90a367 100644
--- a/doc/arm/platforms.inc.rst
+++ b/doc/arm/platforms.inc.rst
@@ -47,7 +47,7 @@ following systems:
 -  Ubuntu LTS 22.04, 24.04, 26.04
 -  Fedora 44
 -  Red Hat Enterprise Linux / CentOS / AlmaLinux 8, 9, 10
--  FreeBSD 13, 14, 15
+-  FreeBSD 14, 15
 -  Alpine Linux 3.24
 
 The amd64 CPU architecture is fully supported and regularly tested.
@@ -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, 12.x
+   -  FreeBSD 10.x, 11.x, 12.x, 13.x
 
 -  Less common CPU architectures (i386, i686, mips, mipsel, sparc, ppc, and others)