From 3aa9746f0236c4659255afb064f8432b9c0bd053 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

(cherry picked from commit 668be42965cdfac1ea811a91cefa0f4716eb2403)
---
 .gitlab-ci.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60533d6442..0649281f95 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -149,12 +149,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
@@ -1138,7 +1138,7 @@ unit:clang:buster:amd64:
     - job: clang:buster:amd64
       artifacts: true
 
-# Jobs for PKCS#11-enabled GCC builds on Fedora 34 (amd64)
+# Jobs for PKCS#11-enabled GCC builds on Fedora 35 (amd64)
 
 # "--disable-warn-error" ./configure option disables compiler warnings. This
 # ensures that the job will not fail because of warnings (e.g., array
@@ -1149,18 +1149,18 @@ gcc:pkcs11:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "--enable-native-pkcs11 --with-pkcs11=/usr/lib64/pkcs11/libsofthsm2.so --disable-warn-error"
-  <<: *fedora_34_amd64_image
+  <<: *fedora_35_amd64_image
   <<: *build_job
 
 system:gcc:pkcs11:
-  <<: *fedora_34_amd64_image
+  <<: *fedora_35_amd64_image
   <<: *system_test_job
   needs:
     - job: gcc:pkcs11
       artifacts: true
 
 unit:gcc:pkcs11:
-  <<: *fedora_34_amd64_image
+  <<: *fedora_35_amd64_image
   <<: *unit_test_job
   needs:
     - job: gcc:pkcs11
@@ -1460,8 +1460,8 @@ respdiff:
     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:
@@ -1474,8 +1474,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:
@@ -1488,8 +1488,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:
@@ -1502,8 +1502,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: