From a3064a9f92c60e916f6f5e1ff33d450d4da38256 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Thu, 10 Oct 2024 11:11:48 +0200
Subject: [PATCH] Add Fedora 41

(cherry picked from commit 66fddf812fd9923fb8afe12df3701ac3497e8947)
---
 .gitlab-ci.yml            | 76 +++++++++++++++++++--------------------
 doc/arm/platforms.inc.rst |  2 +-
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bffd5048fb..80aea67165 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -163,16 +163,16 @@ stages:
 
 # Fedora
 
-.tsan-fedora-40-amd64: &tsan_fedora_40_amd64_image
-  image: "$CI_REGISTRY_IMAGE:tsan-fedora-40-amd64"
+.tsan-fedora-41-amd64: &tsan_fedora_41_amd64_image
+  image: "$CI_REGISTRY_IMAGE:tsan-fedora-41-amd64"
   <<: *linux_amd64
 
-.fedora-40-amd64: &fedora_40_amd64_image
-  image: "$CI_REGISTRY_IMAGE:fedora-40-amd64"
+.fedora-41-amd64: &fedora_41_amd64_image
+  image: "$CI_REGISTRY_IMAGE:fedora-41-amd64"
   <<: *linux_amd64
 
-.fedora-40-arm64: &fedora_40_arm64_image
-  image: "$CI_REGISTRY_IMAGE:fedora-40-arm64"
+.fedora-41-arm64: &fedora_41_arm64_image
+  image: "$CI_REGISTRY_IMAGE:fedora-41-arm64"
   <<: *linux_arm64
 
 # Ubuntu
@@ -1124,7 +1124,7 @@ unit:gcc:noble:amd64:
     - job: gcc:noble:amd64
       artifacts: true
 
-# Jobs for ASAN builds on Fedora 40 (amd64)
+# Jobs for ASAN builds on Fedora 41 (amd64)
 
 gcc:asan:
   variables:
@@ -1132,20 +1132,20 @@ gcc:asan:
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=address,undefined"
     LDFLAGS: "-fsanitize=address,undefined"
     EXTRA_CONFIGURE: "--with-libidn2 --without-jemalloc"
-  <<: *fedora_40_amd64_image
+  <<: *fedora_41_amd64_image
   <<: *build_job
 
 system:gcc:asan:
   variables:
     LSAN_OPTIONS: "suppressions=$CI_PROJECT_DIR/suppr-lsan.txt"
-  <<: *fedora_40_amd64_image
+  <<: *fedora_41_amd64_image
   <<: *system_test_job
   needs:
     - job: gcc:asan
       artifacts: true
 
 unit:gcc:asan:
-  <<: *fedora_40_amd64_image
+  <<: *fedora_41_amd64_image
   <<: *unit_test_job
   needs:
     - job: gcc:asan
@@ -1174,7 +1174,7 @@ unit:clang:asan:
     - job: clang:asan
       artifacts: true
 
-# Jobs for TSAN builds on Fedora 40 (amd64)
+# Jobs for TSAN builds on Fedora 41 (amd64)
 
 gcc:tsan:
   variables:
@@ -1184,13 +1184,13 @@ gcc:tsan:
     OPENSSL_CFLAGS: -I/opt/tsan/include
     OPENSSL_LIBS: -L/opt/tsan/lib -lssl -lcrypto
     EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --without-jemalloc PKG_CONFIG_PATH=/opt/tsan/lib/pkgconfig"
-  <<: *tsan_fedora_40_amd64_image
+  <<: *tsan_fedora_41_amd64_image
   <<: *build_job
 
 system:gcc:tsan:
   variables:
     TSAN_OPTIONS: "${TSAN_OPTIONS_FEDORA}"
-  <<: *tsan_fedora_40_amd64_image
+  <<: *tsan_fedora_41_amd64_image
   <<: *system_test_tsan_job
   needs:
     - job: gcc:tsan
@@ -1199,7 +1199,7 @@ system:gcc:tsan:
 unit:gcc:tsan:
   variables:
     TSAN_OPTIONS: "${TSAN_OPTIONS_FEDORA}"
-  <<: *tsan_fedora_40_amd64_image
+  <<: *tsan_fedora_41_amd64_image
   <<: *unit_test_tsan_job
   needs:
     - job: gcc:tsan
@@ -1620,8 +1620,8 @@ shotgun:dot:
       - "output/rpz_*"
     when: always
 
-stress:short:authoritative:fedora:40:amd64:
-  <<: *fedora_40_amd64_image
+stress:short:authoritative:fedora:41:amd64:
+  <<: *fedora_41_amd64_image
   <<: *linux_amd64
   <<: *stress_test_short_job
   variables:
@@ -1632,8 +1632,8 @@ stress:short:authoritative:fedora:40:amd64:
     RATE: 10000
     RUN_TIME: 15
 
-stress:short:recursive:fedora:40:amd64:
-  <<: *fedora_40_amd64_image
+stress:short:recursive:fedora:41:amd64:
+  <<: *fedora_41_amd64_image
   <<: *linux_amd64
   <<: *stress_test_short_job
   variables:
@@ -1644,8 +1644,8 @@ stress:short:recursive:fedora:40:amd64:
     RATE: 10000
     RUN_TIME: 15
 
-stress:short:rpz:fedora:40:amd64:
-  <<: *fedora_40_amd64_image
+stress:short:rpz:fedora:41:amd64:
+  <<: *fedora_41_amd64_image
   <<: *linux_amd64
   <<: *stress_test_short_job
   variables:
@@ -1656,8 +1656,8 @@ stress:short:rpz:fedora:40:amd64:
     RATE: 1500
     RUN_TIME: 15
 
-stress:short:authoritative:fedora:40:arm64:
-  <<: *fedora_40_arm64_image
+stress:short:authoritative:fedora:41:arm64:
+  <<: *fedora_41_arm64_image
   <<: *linux_arm64
   <<: *stress_test_short_job
   variables:
@@ -1668,8 +1668,8 @@ stress:short:authoritative:fedora:40:arm64:
     RATE: 10000
     RUN_TIME: 15
 
-stress:short:recursive:fedora:40:arm64:
-  <<: *fedora_40_arm64_image
+stress:short:recursive:fedora:41:arm64:
+  <<: *fedora_41_arm64_image
   <<: *linux_arm64
   <<: *stress_test_short_job
   variables:
@@ -1680,8 +1680,8 @@ stress:short:recursive:fedora:40:arm64:
     RATE: 10000
     RUN_TIME: 15
 
-stress:short:rpz:fedora:40:arm64:
-  <<: *fedora_40_arm64_image
+stress:short:rpz:fedora:41:arm64:
+  <<: *fedora_41_arm64_image
   <<: *linux_arm64
   <<: *stress_test_short_job
   variables:
@@ -1725,8 +1725,8 @@ stress:short:rpz:freebsd13:amd64:
     RATE: 1500
     RUN_TIME: 15
 
-stress:authoritative:fedora:40:amd64:
-  <<: *fedora_40_amd64_image
+stress:authoritative:fedora:41:amd64:
+  <<: *fedora_41_amd64_image
   <<: *linux_amd64
   <<: *stress_test_long_job
   variables:
@@ -1740,8 +1740,8 @@ stress:authoritative:fedora:40:amd64:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /linux/i && $BIND_STRESS_TEST_MODE =~ /authoritative/i && $BIND_STRESS_TEST_ARCH =~ /amd64/i)
 
-stress:recursive:fedora:40:amd64:
-  <<: *fedora_40_amd64_image
+stress:recursive:fedora:41:amd64:
+  <<: *fedora_41_amd64_image
   <<: *linux_amd64
   <<: *stress_test_long_job
   variables:
@@ -1755,8 +1755,8 @@ stress:recursive:fedora:40:amd64:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /linux/i && $BIND_STRESS_TEST_MODE =~ /recursive/i && $BIND_STRESS_TEST_ARCH =~ /amd64/i)
 
-stress:rpz:fedora:40:amd64:
-  <<: *fedora_40_amd64_image
+stress:rpz:fedora:41:amd64:
+  <<: *fedora_41_amd64_image
   <<: *linux_amd64
   <<: *stress_test_long_job
   variables:
@@ -1770,8 +1770,8 @@ stress:rpz:fedora:40:amd64:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /linux/i && $BIND_STRESS_TEST_MODE =~ /rpz/i && $BIND_STRESS_TEST_ARCH =~ /amd64/i)
 
-stress:authoritative:fedora:40:arm64:
-  <<: *fedora_40_arm64_image
+stress:authoritative:fedora:41:arm64:
+  <<: *fedora_41_arm64_image
   <<: *linux_arm64
   <<: *stress_test_long_job
   variables:
@@ -1785,8 +1785,8 @@ stress:authoritative:fedora:40:arm64:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /linux/i && $BIND_STRESS_TEST_MODE =~ /authoritative/i && $BIND_STRESS_TEST_ARCH =~ /arm64/i)
 
-stress:recursive:fedora:40:arm64:
-  <<: *fedora_40_arm64_image
+stress:recursive:fedora:41:arm64:
+  <<: *fedora_41_arm64_image
   <<: *linux_arm64
   <<: *stress_test_long_job
   variables:
@@ -1800,8 +1800,8 @@ stress:recursive:fedora:40:arm64:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /linux/i && $BIND_STRESS_TEST_MODE =~ /recursive/i && $BIND_STRESS_TEST_ARCH =~ /arm64/i)
 
-stress:rpz:fedora:40:arm64:
-  <<: *fedora_40_arm64_image
+stress:rpz:fedora:41:arm64:
+  <<: *fedora_41_arm64_image
   <<: *linux_arm64
   <<: *stress_test_long_job
   variables:
diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst
index f54780fa38..62828bf8ab 100644
--- a/doc/arm/platforms.inc.rst
+++ b/doc/arm/platforms.inc.rst
@@ -47,7 +47,7 @@ following systems:
 
 -  Debian 12
 -  Ubuntu LTS 20.04, 22.04, 24.04
--  Fedora 40
+-  Fedora 41
 -  Red Hat Enterprise Linux / CentOS / Oracle Linux 8, 9
 -  FreeBSD 13.4, 14.2
 -  Alpine Linux 3.21