From 668be42965cdfac1ea811a91cefa0f4716eb2403 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Tue, 2 Nov 2021 20:56:25 +0100
Subject: [PATCH] Add Fedora 35

---
 .gitlab-ci.yml | 36 ++++++++++++++++++------------------
 PLATFORMS.md   |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68c456a57e..5c177ca8c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -147,12 +147,12 @@ stages:
 
 # Fedora
 
-.fedora-34-amd64: &fedora_34_amd64_image
-  image: "$CI_REGISTRY_IMAGE:fedora-34-amd64"
+.fedora-35-amd64: &fedora_35_amd64_image
+  image: "$CI_REGISTRY_IMAGE:fedora-35-amd64"
   <<: *linux_amd64
 
-.fedora-34-arm64: &fedora_34_arm64_image
-  image: "$CI_REGISTRY_IMAGE:fedora-34-arm64"
+.fedora-35-arm64: &fedora_35_arm64_image
+  image: "$CI_REGISTRY_IMAGE:fedora-35-arm64"
   <<: *linux_stress_arm64
 
 # Ubuntu
@@ -914,18 +914,18 @@ gcc:asan:
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=address,undefined"
     LDFLAGS: "-fsanitize=address,undefined"
     EXTRA_CONFIGURE: "--with-libidn2 --without-jemalloc"
-  <<: *fedora_34_amd64_image
+  <<: *fedora_35_amd64_image
   <<: *build_job
 
 system:gcc:asan:
-  <<: *fedora_34_amd64_image
+  <<: *fedora_35_amd64_image
   <<: *system_test_job
   needs:
     - job: gcc:asan
       artifacts: true
 
 unit:gcc:asan:
-  <<: *fedora_34_amd64_image
+  <<: *fedora_35_amd64_image
   <<: *unit_test_job
   needs:
     - job: gcc:asan
@@ -962,13 +962,13 @@ gcc:tsan:
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=thread"
     LDFLAGS: "-fsanitize=thread"
     EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --without-jemalloc"
-  <<: *fedora_34_amd64_image
+  <<: *fedora_35_amd64_image
   <<: *build_job
 
 system:gcc:tsan:
   variables:
     TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
-  <<: *fedora_34_amd64_image
+  <<: *fedora_35_amd64_image
   <<: *system_test_tsan_job
   needs:
     - job: gcc:tsan
@@ -977,7 +977,7 @@ system:gcc:tsan:
 unit:gcc:tsan:
   variables:
     TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
-  <<: *fedora_34_amd64_image
+  <<: *fedora_35_amd64_image
   <<: *unit_test_tsan_job
   needs:
     - job: gcc:tsan
@@ -1291,8 +1291,8 @@ respdiff-third-party:
     when: always
   timeout: 2h
 
-stress:authoritative:fedora:34:amd64:
-  <<: *fedora_34_amd64_image
+stress:authoritative:fedora:35:amd64:
+  <<: *fedora_35_amd64_image
   <<: *linux_stress_amd64
   <<: *stress_job
   variables:
@@ -1305,8 +1305,8 @@ stress:authoritative:fedora:34: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:34:amd64:
-  <<: *fedora_34_amd64_image
+stress:recursive:fedora:35:amd64:
+  <<: *fedora_35_amd64_image
   <<: *linux_stress_amd64
   <<: *stress_job
   variables:
@@ -1319,8 +1319,8 @@ stress:recursive:fedora:34:amd64:
     variables:
       - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /linux/i && $BIND_STRESS_TEST_MODE =~ /recursive/i && $BIND_STRESS_TEST_ARCH =~ /amd64/i)
 
-stress:authoritative:fedora:34:arm64:
-  <<: *fedora_34_arm64_image
+stress:authoritative:fedora:35:arm64:
+  <<: *fedora_35_arm64_image
   <<: *linux_stress_arm64
   <<: *stress_job
   variables:
@@ -1333,8 +1333,8 @@ stress:authoritative:fedora:34: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:34:arm64:
-  <<: *fedora_34_arm64_image
+stress:recursive:fedora:35:arm64:
+  <<: *fedora_35_arm64_image
   <<: *linux_stress_arm64
   <<: *stress_job
   variables:
diff --git a/PLATFORMS.md b/PLATFORMS.md
index 6eef1c38b8..fdedbc856e 100644
--- a/PLATFORMS.md
+++ b/PLATFORMS.md
@@ -62,7 +62,7 @@ following systems:
 
 * Debian 9, 10, 11
 * Ubuntu LTS 18.04, 20.04
-* Fedora 34
+* Fedora 35
 * Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8
 * FreeBSD 12.2, 13.0
 * OpenBSD 7.0