From 465a7970143279b7a6985f5a58c37ef9e0272a09 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Mon, 17 Apr 2023 19:15:17 +0200
Subject: [PATCH] Add Fedora 38

(cherry picked from commit 2e0550970bdfbcd959a6a2a862225daaf0dd0ec2)
---
 .gitlab-ci.yml            | 48 +++++++++++++++++++--------------------
 doc/arm/platforms.inc.rst |  2 +-
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8014e987ac..0ebe858d2a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -150,12 +150,12 @@ stages:
 
 # Fedora
 
-.fedora-37-amd64: &fedora_37_amd64_image
-  image: "$CI_REGISTRY_IMAGE:fedora-37-amd64"
+.fedora-38-amd64: &fedora_38_amd64_image
+  image: "$CI_REGISTRY_IMAGE:fedora-38-amd64"
   <<: *linux_amd64
 
-.fedora-37-arm64: &fedora_37_arm64_image
-  image: "$CI_REGISTRY_IMAGE:fedora-37-arm64"
+.fedora-38-arm64: &fedora_38_arm64_image
+  image: "$CI_REGISTRY_IMAGE:fedora-38-arm64"
   <<: *linux_stress_arm64
 
 # Ubuntu
@@ -985,7 +985,7 @@ unit:gcc:jammy:amd64:
     - job: gcc:jammy:amd64
       artifacts: true
 
-# Jobs for ASAN builds on Fedora 37 (amd64)
+# Jobs for ASAN builds on Fedora 38 (amd64)
 
 gcc:asan:
   variables:
@@ -993,20 +993,20 @@ gcc:asan:
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=address,undefined"
     LDFLAGS: "-fsanitize=address,undefined"
     EXTRA_CONFIGURE: "--with-libidn2 --without-jemalloc"
-  <<: *fedora_37_amd64_image
+  <<: *fedora_38_amd64_image
   <<: *build_job
 
 system:gcc:asan:
   variables:
     LSAN_OPTIONS: "suppressions=$CI_PROJECT_DIR/suppr-lsan.txt"
-  <<: *fedora_37_amd64_image
+  <<: *fedora_38_amd64_image
   <<: *system_test_job
   needs:
     - job: gcc:asan
       artifacts: true
 
 unit:gcc:asan:
-  <<: *fedora_37_amd64_image
+  <<: *fedora_38_amd64_image
   <<: *unit_test_job
   needs:
     - job: gcc:asan
@@ -1035,7 +1035,7 @@ unit:clang:asan:
     - job: clang:asan
       artifacts: true
 
-# Jobs for TSAN builds on Fedora 37 (amd64)
+# Jobs for TSAN builds on Fedora 38 (amd64)
 
 gcc:tsan:
   variables:
@@ -1043,13 +1043,13 @@ gcc:tsan:
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=thread"
     LDFLAGS: "-fsanitize=thread"
     EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --without-jemalloc"
-  <<: *fedora_37_amd64_image
+  <<: *fedora_38_amd64_image
   <<: *build_job
 
 system:gcc:tsan:
   variables:
     TSAN_OPTIONS: "${TSAN_OPTIONS_COMMON} external_symbolizer_path=/usr/bin/llvm-symbolizer"
-  <<: *fedora_37_amd64_image
+  <<: *fedora_38_amd64_image
   <<: *system_test_tsan_job
   needs:
     - job: gcc:tsan
@@ -1058,7 +1058,7 @@ system:gcc:tsan:
 unit:gcc:tsan:
   variables:
     TSAN_OPTIONS: "${TSAN_OPTIONS_COMMON} external_symbolizer_path=/usr/bin/llvm-symbolizer"
-  <<: *fedora_37_amd64_image
+  <<: *fedora_38_amd64_image
   <<: *unit_test_tsan_job
   needs:
     - job: gcc:tsan
@@ -1407,8 +1407,8 @@ respdiff-long-third-party:
     when: always
   timeout: 2h
 
-stress:authoritative:fedora:37:amd64:
-  <<: *fedora_37_amd64_image
+stress:authoritative:fedora:38:amd64:
+  <<: *fedora_38_amd64_image
   <<: *linux_stress_amd64
   <<: *stress_job
   variables:
@@ -1422,8 +1422,8 @@ stress:authoritative:fedora:37: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:37:amd64:
-  <<: *fedora_37_amd64_image
+stress:recursive:fedora:38:amd64:
+  <<: *fedora_38_amd64_image
   <<: *linux_stress_amd64
   <<: *stress_job
   variables:
@@ -1437,8 +1437,8 @@ stress:recursive:fedora:37: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:37:amd64:
-  <<: *fedora_37_amd64_image
+stress:rpz:fedora:38:amd64:
+  <<: *fedora_38_amd64_image
   <<: *linux_stress_amd64
   <<: *stress_job
   variables:
@@ -1452,8 +1452,8 @@ stress:rpz:fedora:37: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:37:arm64:
-  <<: *fedora_37_arm64_image
+stress:authoritative:fedora:38:arm64:
+  <<: *fedora_38_arm64_image
   <<: *linux_stress_arm64
   <<: *stress_job
   variables:
@@ -1467,8 +1467,8 @@ stress:authoritative:fedora:37: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:37:arm64:
-  <<: *fedora_37_arm64_image
+stress:recursive:fedora:38:arm64:
+  <<: *fedora_38_arm64_image
   <<: *linux_stress_arm64
   <<: *stress_job
   variables:
@@ -1482,8 +1482,8 @@ stress:recursive:fedora:37: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:37:arm64:
-  <<: *fedora_37_arm64_image
+stress:rpz:fedora:38:arm64:
+  <<: *fedora_38_arm64_image
   <<: *linux_stress_arm64
   <<: *stress_job
   variables:
diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst
index 88fb9d2752..dc12ca2cfd 100644
--- a/doc/arm/platforms.inc.rst
+++ b/doc/arm/platforms.inc.rst
@@ -47,7 +47,7 @@ following systems:
 
 -  Debian 10, 11
 -  Ubuntu LTS 18.04, 20.04, 22.04
--  Fedora 37
+-  Fedora 38
 -  Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8, 9
 -  FreeBSD 12.4, 13.2
 -  OpenBSD 7.3