From 5f27aaa0ff3c471a8a90340f2fe5eb62e43571ab Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Thu, 20 May 2021 14:40:47 +0200
Subject: [PATCH] Add Fedora 34

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d6a9c489fc..3277e2b9e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -137,12 +137,12 @@ stages:
 
 # Fedora
 
-.fedora-33-amd64: &fedora_33_amd64_image
-  image: "$CI_REGISTRY_IMAGE:fedora-33-amd64"
+.fedora-34-amd64: &fedora_34_amd64_image
+  image: "$CI_REGISTRY_IMAGE:fedora-34-amd64"
   <<: *linux_amd64
 
-.fedora-33-arm64: &fedora_33_arm64_image
-  image: "$CI_REGISTRY_IMAGE:fedora-33-arm64"
+.fedora-34-arm64: &fedora_34_arm64_image
+  image: "$CI_REGISTRY_IMAGE:fedora-34-arm64"
   <<: *linux_stress_arm64
 
 # Ubuntu
@@ -1096,25 +1096,25 @@ unit:gcc:softhsm2.4:
     - job: gcc:softhsm2.4
       artifacts: true
 
-# Jobs for PKCS#11-enabled GCC builds on Fedora 33 (amd64)
+# Jobs for PKCS#11-enabled GCC builds on Fedora 34 (amd64)
 
 gcc:softhsm2.6:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -O1"
     EXTRA_CONFIGURE: "--with-libidn2 --enable-native-pkcs11 --with-pkcs11=/usr/lib64/pkcs11/libsofthsm2.so"
-  <<: *fedora_33_amd64_image
+  <<: *fedora_34_amd64_image
   <<: *build_job
 
 system:gcc:softhsm2.6:
-  <<: *fedora_33_amd64_image
+  <<: *fedora_34_amd64_image
   <<: *system_test_job
   needs:
     - job: gcc:softhsm2.6
       artifacts: true
 
 unit:gcc:softhsm2.6:
-  <<: *fedora_33_amd64_image
+  <<: *fedora_34_amd64_image
   <<: *unit_test_job
   needs:
     - job: gcc:softhsm2.6
@@ -1429,8 +1429,8 @@ respdiff:
     when: always
   timeout: 2h
 
-stress:authoritative:fedora:33:amd64:
-  <<: *fedora_33_amd64_image
+stress:authoritative:fedora:34:amd64:
+  <<: *fedora_34_amd64_image
   <<: *linux_stress_amd64
   <<: *stress_job
   variables:
@@ -1443,8 +1443,8 @@ stress:authoritative:fedora:33: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:33:amd64:
-  <<: *fedora_33_amd64_image
+stress:recursive:fedora:34:amd64:
+  <<: *fedora_34_amd64_image
   <<: *linux_stress_amd64
   <<: *stress_job
   variables:
@@ -1457,8 +1457,8 @@ stress:recursive:fedora:33: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:33:arm64:
-  <<: *fedora_33_arm64_image
+stress:authoritative:fedora:34:arm64:
+  <<: *fedora_34_arm64_image
   <<: *linux_stress_arm64
   <<: *stress_job
   variables:
@@ -1471,8 +1471,8 @@ stress:authoritative:fedora:33: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:33:arm64:
-  <<: *fedora_33_arm64_image
+stress:recursive:fedora:34:arm64:
+  <<: *fedora_34_arm64_image
   <<: *linux_stress_arm64
   <<: *stress_job
   variables:
diff --git a/PLATFORMS.md b/PLATFORMS.md
index c4a970aa78..a58782e923 100644
--- a/PLATFORMS.md
+++ b/PLATFORMS.md
@@ -47,7 +47,7 @@ following systems:
 
 * Debian 9, 10
 * Ubuntu LTS 18.04, 20.04
-* Fedora 33
+* Fedora 34
 * Red Hat Enterprise Linux / CentOS 7, 8
 * FreeBSD 11.4, 12.2, 13.0
 * OpenBSD 6.9