From a313c49a3b1460408df3ebafb66eadd3b00e217d Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Thu, 12 May 2022 17:09:05 +0200
Subject: [PATCH] Add Fedora 36

---
 .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 8ad8b489b8..d6aeef63e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -146,12 +146,12 @@ stages:
 
 # Fedora
 
-.fedora-35-amd64: &fedora_35_amd64_image
-  image: "$CI_REGISTRY_IMAGE:fedora-35-amd64"
+.fedora-36-amd64: &fedora_36_amd64_image
+  image: "$CI_REGISTRY_IMAGE:fedora-36-amd64"
   <<: *linux_amd64
 
-.fedora-35-arm64: &fedora_35_arm64_image
-  image: "$CI_REGISTRY_IMAGE:fedora-35-arm64"
+.fedora-36-arm64: &fedora_36_arm64_image
+  image: "$CI_REGISTRY_IMAGE:fedora-36-arm64"
   <<: *linux_stress_arm64
 
 # Ubuntu
@@ -986,7 +986,7 @@ unit:gcc:jammy:amd64:
     - job: gcc:jammy:amd64
       artifacts: true
 
-# Jobs for ASAN builds on Fedora 35 (amd64)
+# Jobs for ASAN builds on Fedora 36 (amd64)
 
 gcc:asan:
   variables:
@@ -994,20 +994,20 @@ gcc:asan:
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=address,undefined"
     LDFLAGS: "-fsanitize=address,undefined"
     EXTRA_CONFIGURE: "--with-libidn2 --without-jemalloc"
-  <<: *fedora_35_amd64_image
+  <<: *fedora_36_amd64_image
   <<: *build_job
 
 system:gcc:asan:
   variables:
     LSAN_OPTIONS: "suppressions=$CI_PROJECT_DIR/suppr-lsan.txt"
-  <<: *fedora_35_amd64_image
+  <<: *fedora_36_amd64_image
   <<: *system_test_job
   needs:
     - job: gcc:asan
       artifacts: true
 
 unit:gcc:asan:
-  <<: *fedora_35_amd64_image
+  <<: *fedora_36_amd64_image
   <<: *unit_test_job
   needs:
     - job: gcc:asan
@@ -1036,7 +1036,7 @@ unit:clang:asan:
     - job: clang:asan
       artifacts: true
 
-# Jobs for TSAN builds on Fedora 35 (amd64)
+# Jobs for TSAN builds on Fedora 36 (amd64)
 
 gcc:tsan:
   variables:
@@ -1044,13 +1044,13 @@ gcc:tsan:
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=thread"
     LDFLAGS: "-fsanitize=thread"
     EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --without-jemalloc"
-  <<: *fedora_35_amd64_image
+  <<: *fedora_36_amd64_image
   <<: *build_job
 
 system:gcc:tsan:
   variables:
     TSAN_OPTIONS: "${TSAN_OPTIONS_COMMON} external_symbolizer_path=/usr/bin/llvm-symbolizer"
-  <<: *fedora_35_amd64_image
+  <<: *fedora_36_amd64_image
   <<: *system_test_tsan_job
   needs:
     - job: gcc:tsan
@@ -1059,7 +1059,7 @@ system:gcc:tsan:
 unit:gcc:tsan:
   variables:
     TSAN_OPTIONS: "${TSAN_OPTIONS_COMMON} external_symbolizer_path=/usr/bin/llvm-symbolizer"
-  <<: *fedora_35_amd64_image
+  <<: *fedora_36_amd64_image
   <<: *unit_test_tsan_job
   needs:
     - job: gcc:tsan
@@ -1345,8 +1345,8 @@ respdiff-long-third-party:
     when: always
   timeout: 2h
 
-stress:authoritative:fedora:35:amd64:
-  <<: *fedora_35_amd64_image
+stress:authoritative:fedora:36:amd64:
+  <<: *fedora_36_amd64_image
   <<: *linux_stress_amd64
   <<: *stress_job
   variables:
@@ -1359,8 +1359,8 @@ stress:authoritative:fedora:35: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:35:amd64:
-  <<: *fedora_35_amd64_image
+stress:recursive:fedora:36:amd64:
+  <<: *fedora_36_amd64_image
   <<: *linux_stress_amd64
   <<: *stress_job
   variables:
@@ -1373,8 +1373,8 @@ stress:recursive:fedora:35: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:35:amd64:
-  <<: *fedora_35_amd64_image
+stress:rpz:fedora:36:amd64:
+  <<: *fedora_36_amd64_image
   <<: *linux_stress_amd64
   <<: *stress_job
   variables:
@@ -1387,8 +1387,8 @@ stress:rpz:fedora:35: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:35:arm64:
-  <<: *fedora_35_arm64_image
+stress:authoritative:fedora:36:arm64:
+  <<: *fedora_36_arm64_image
   <<: *linux_stress_arm64
   <<: *stress_job
   variables:
@@ -1401,8 +1401,8 @@ stress:authoritative:fedora:35: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:35:arm64:
-  <<: *fedora_35_arm64_image
+stress:recursive:fedora:36:arm64:
+  <<: *fedora_36_arm64_image
   <<: *linux_stress_arm64
   <<: *stress_job
   variables:
@@ -1415,8 +1415,8 @@ stress:recursive:fedora:35: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:35:arm64:
-  <<: *fedora_35_arm64_image
+stress:rpz:fedora:36:arm64:
+  <<: *fedora_36_arm64_image
   <<: *linux_stress_arm64
   <<: *stress_job
   variables:
diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst
index 53b6a6d1f8..ef17d6c5f7 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 35
+-  Fedora 36
 -  Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8, 9
 -  FreeBSD 12.3, 13.1
 -  OpenBSD 7.1