From 219afd0227cc59350651249245ea3747a9de4ab5 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 22 Nov 2021 10:32:59 +1100
Subject: [PATCH] Update Fedora 34 to 35

Change-Id: I84f9e052f488217f8a63791556de99469451a1d9
---
 tools/update-test-platforms.py         |  2 +-
 zuul-tests.d/container-roles-jobs.yaml | 22 +++++-----
 zuul-tests.d/general-roles-jobs.yaml   | 56 +++++++++++++-------------
 zuul-tests.d/go-jobs.yaml              | 12 +++---
 zuul-tests.d/haskell.yaml              | 12 +++---
 zuul-tests.d/nim-jobs.yaml             | 12 +++---
 zuul-tests.d/packer-jobs.yaml          | 12 +++---
 zuul-tests.d/python-jobs.yaml          | 36 ++++++++---------
 zuul-tests.d/python-roles-jobs.yaml    | 24 +++++------
 zuul-tests.d/rust-jobs.yaml            | 12 +++---
 zuul-tests.d/terraform-jobs-roles.yaml | 20 ++++-----
 11 files changed, 110 insertions(+), 110 deletions(-)

diff --git a/tools/update-test-platforms.py b/tools/update-test-platforms.py
index 5d948e1c2..f58b606e8 100755
--- a/tools/update-test-platforms.py
+++ b/tools/update-test-platforms.py
@@ -35,7 +35,7 @@ PLATFORMS = [
     'centos-8-stream',
     'debian-buster',
     'debian-bullseye',
-    'fedora-34',
+    'fedora-35',
     # 'gentoo-17-0-systemd',
     'opensuse-15',
     'opensuse-tumbleweed',
diff --git a/zuul-tests.d/container-roles-jobs.yaml b/zuul-tests.d/container-roles-jobs.yaml
index b066d5abb..f11c904bd 100644
--- a/zuul-tests.d/container-roles-jobs.yaml
+++ b/zuul-tests.d/container-roles-jobs.yaml
@@ -394,16 +394,16 @@
           label: centos-8-stream
 
 - job:
-    name: zuul-jobs-test-ensure-podman-fedora-34
-    description: Tests ensure-podman role on fedora-34
+    name: zuul-jobs-test-ensure-podman-fedora-35
+    description: Tests ensure-podman role on fedora-35
     parent: zuul-jobs-test-ensure-podman
     # Until non-root podman issues are sorted; see
     #  https://github.com/containers/podman/issues/10717
     voting: false
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-ensure-podman-ubuntu-bionic
@@ -442,13 +442,13 @@
           label: centos-8
 
 - job:
-    name: zuul-jobs-test-ensure-skopeo-fedora-34
-    description: Tests ensure-skopeo role on fedora-34
+    name: zuul-jobs-test-ensure-skopeo-fedora-35
+    description: Tests ensure-skopeo role on fedora-35
     parent: zuul-jobs-test-ensure-skopeo
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-ensure-skopeo-ubuntu-bionic
@@ -494,12 +494,12 @@
         - zuul-jobs-test-ensure-kubernetes-crio
         - zuul-jobs-test-ensure-podman-centos-8
         - zuul-jobs-test-ensure-podman-centos-8-stream
-        - zuul-jobs-test-ensure-podman-fedora-34
+        - zuul-jobs-test-ensure-podman-fedora-35
         - zuul-jobs-test-ensure-podman-ubuntu-bionic
         - zuul-jobs-test-ensure-podman-ubuntu-focal
         - zuul-jobs-test-ensure-podman-debian-bullseye
         - zuul-jobs-test-ensure-skopeo-centos-8
-        - zuul-jobs-test-ensure-skopeo-fedora-34
+        - zuul-jobs-test-ensure-skopeo-fedora-35
         - zuul-jobs-test-ensure-skopeo-ubuntu-bionic
         - zuul-jobs-test-ensure-skopeo-ubuntu-focal
     gate:
@@ -526,7 +526,7 @@
         - zuul-jobs-test-ensure-podman-ubuntu-focal
         - zuul-jobs-test-ensure-podman-debian-bullseye
         - zuul-jobs-test-ensure-skopeo-centos-8
-        - zuul-jobs-test-ensure-skopeo-fedora-34
+        - zuul-jobs-test-ensure-skopeo-fedora-35
         - zuul-jobs-test-ensure-skopeo-ubuntu-bionic
         - zuul-jobs-test-ensure-skopeo-ubuntu-focal
     periodic-weekly:
diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml
index fcdfb422a..7bf8921d1 100644
--- a/zuul-tests.d/general-roles-jobs.yaml
+++ b/zuul-tests.d/general-roles-jobs.yaml
@@ -175,14 +175,14 @@
           label: debian-bullseye
 
 - job:
-    name: zuul-jobs-test-base-roles-fedora-34
-    description: Tests roles in the 'base' job on fedora-34
+    name: zuul-jobs-test-base-roles-fedora-35
+    description: Tests roles in the 'base' job on fedora-35
     parent: zuul-jobs-test-base-roles
     tags: auto-generated
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-base-roles-opensuse-15
@@ -289,14 +289,14 @@
           label: debian-bullseye
 
 - job:
-    name: zuul-jobs-test-bindep-fedora-34
-    description: Test the bindep role on fedora-34
+    name: zuul-jobs-test-bindep-fedora-35
+    description: Test the bindep role on fedora-35
     parent: zuul-jobs-test-bindep
     tags: auto-generated
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-bindep-opensuse-15
@@ -443,14 +443,14 @@
           label: debian-bullseye
 
 - job:
-    name: zuul-jobs-test-dstat-graph-fedora-34
-    description: Test the dstat-graph roles on fedora-34
+    name: zuul-jobs-test-dstat-graph-fedora-35
+    description: Test the dstat-graph roles on fedora-35
     parent: zuul-jobs-test-dstat-graph
     tags: auto-generated
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-dstat-graph-opensuse-15
@@ -607,16 +607,16 @@
             - secondary
 
 - job:
-    name: zuul-jobs-test-multinode-roles-fedora-34
-    description: Tests multinode setup roles on fedora-34
+    name: zuul-jobs-test-multinode-roles-fedora-35
+    description: Tests multinode setup roles on fedora-35
     parent: zuul-jobs-test-multinode-roles
     tags: auto-generated
     nodeset:
       nodes:
         - name: primary
-          label: fedora-34
+          label: fedora-35
         - name: secondary
-          label: fedora-34
+          label: fedora-35
       groups:
         - name: switch
           nodes:
@@ -740,8 +740,8 @@
       - test-playbooks/shake/setup-project.yaml
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-ensure-zookeeper
@@ -752,8 +752,8 @@
     run: test-playbooks/ensure-zookeeper.yaml
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-update-json-file
@@ -807,7 +807,7 @@
         - zuul-jobs-test-base-roles-centos-8-stream
         - zuul-jobs-test-base-roles-debian-buster
         - zuul-jobs-test-base-roles-debian-bullseye
-        - zuul-jobs-test-base-roles-fedora-34
+        - zuul-jobs-test-base-roles-fedora-35
         - zuul-jobs-test-base-roles-opensuse-15
         - zuul-jobs-test-base-roles-opensuse-tumbleweed-nv
         - zuul-jobs-test-base-roles-ubuntu-bionic
@@ -817,7 +817,7 @@
         - zuul-jobs-test-bindep-centos-8-stream
         - zuul-jobs-test-bindep-debian-buster
         - zuul-jobs-test-bindep-debian-bullseye
-        - zuul-jobs-test-bindep-fedora-34
+        - zuul-jobs-test-bindep-fedora-35
         - zuul-jobs-test-bindep-opensuse-15
         - zuul-jobs-test-bindep-opensuse-tumbleweed-nv
         - zuul-jobs-test-bindep-ubuntu-bionic
@@ -831,7 +831,7 @@
         - zuul-jobs-test-dstat-graph-centos-8-stream
         - zuul-jobs-test-dstat-graph-debian-buster
         - zuul-jobs-test-dstat-graph-debian-bullseye
-        - zuul-jobs-test-dstat-graph-fedora-34
+        - zuul-jobs-test-dstat-graph-fedora-35
         - zuul-jobs-test-dstat-graph-opensuse-15
         - zuul-jobs-test-dstat-graph-opensuse-tumbleweed-nv
         - zuul-jobs-test-dstat-graph-ubuntu-bionic
@@ -841,7 +841,7 @@
         - zuul-jobs-test-multinode-roles-centos-8-stream
         - zuul-jobs-test-multinode-roles-debian-buster
         - zuul-jobs-test-multinode-roles-debian-bullseye
-        - zuul-jobs-test-multinode-roles-fedora-34
+        - zuul-jobs-test-multinode-roles-fedora-35
         - zuul-jobs-test-multinode-roles-opensuse-15
         - zuul-jobs-test-multinode-roles-opensuse-tumbleweed-nv
         - zuul-jobs-test-multinode-roles-ubuntu-bionic
@@ -865,7 +865,7 @@
         - zuul-jobs-test-base-roles-centos-8-stream
         - zuul-jobs-test-base-roles-debian-buster
         - zuul-jobs-test-base-roles-debian-bullseye
-        - zuul-jobs-test-base-roles-fedora-34
+        - zuul-jobs-test-base-roles-fedora-35
         - zuul-jobs-test-base-roles-opensuse-15
         - zuul-jobs-test-base-roles-ubuntu-bionic
         - zuul-jobs-test-base-roles-ubuntu-focal
@@ -874,7 +874,7 @@
         - zuul-jobs-test-bindep-centos-8-stream
         - zuul-jobs-test-bindep-debian-buster
         - zuul-jobs-test-bindep-debian-bullseye
-        - zuul-jobs-test-bindep-fedora-34
+        - zuul-jobs-test-bindep-fedora-35
         - zuul-jobs-test-bindep-opensuse-15
         - zuul-jobs-test-bindep-ubuntu-bionic
         - zuul-jobs-test-bindep-ubuntu-focal
@@ -887,7 +887,7 @@
         - zuul-jobs-test-dstat-graph-centos-8-stream
         - zuul-jobs-test-dstat-graph-debian-buster
         - zuul-jobs-test-dstat-graph-debian-bullseye
-        - zuul-jobs-test-dstat-graph-fedora-34
+        - zuul-jobs-test-dstat-graph-fedora-35
         - zuul-jobs-test-dstat-graph-opensuse-15
         - zuul-jobs-test-dstat-graph-ubuntu-bionic
         - zuul-jobs-test-dstat-graph-ubuntu-focal
@@ -896,7 +896,7 @@
         - zuul-jobs-test-multinode-roles-centos-8-stream
         - zuul-jobs-test-multinode-roles-debian-buster
         - zuul-jobs-test-multinode-roles-debian-bullseye
-        - zuul-jobs-test-multinode-roles-fedora-34
+        - zuul-jobs-test-multinode-roles-fedora-35
         - zuul-jobs-test-multinode-roles-opensuse-15
         - zuul-jobs-test-multinode-roles-ubuntu-bionic
         - zuul-jobs-test-multinode-roles-ubuntu-focal
diff --git a/zuul-tests.d/go-jobs.yaml b/zuul-tests.d/go-jobs.yaml
index 67e238385..6044714d9 100644
--- a/zuul-tests.d/go-jobs.yaml
+++ b/zuul-tests.d/go-jobs.yaml
@@ -66,14 +66,14 @@
           label: debian-bullseye
 
 - job:
-    name: zuul-jobs-test-golang-go-fedora-34
-    description: Test the golang-go job on fedora-34
+    name: zuul-jobs-test-golang-go-fedora-35
+    description: Test the golang-go job on fedora-35
     parent: zuul-jobs-test-golang-go
     tags: auto-generated
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-golang-go-opensuse-15
@@ -124,7 +124,7 @@
         - zuul-jobs-test-golang-go-centos-8-stream
         - zuul-jobs-test-golang-go-debian-buster
         - zuul-jobs-test-golang-go-debian-bullseye
-        - zuul-jobs-test-golang-go-fedora-34
+        - zuul-jobs-test-golang-go-fedora-35
         - zuul-jobs-test-golang-go-opensuse-15
         - zuul-jobs-test-golang-go-opensuse-tumbleweed-nv
         - zuul-jobs-test-golang-go-ubuntu-bionic
@@ -136,7 +136,7 @@
         - zuul-jobs-test-golang-go-centos-8-stream
         - zuul-jobs-test-golang-go-debian-buster
         - zuul-jobs-test-golang-go-debian-bullseye
-        - zuul-jobs-test-golang-go-fedora-34
+        - zuul-jobs-test-golang-go-fedora-35
         - zuul-jobs-test-golang-go-opensuse-15
         - zuul-jobs-test-golang-go-ubuntu-bionic
         - zuul-jobs-test-golang-go-ubuntu-focal
diff --git a/zuul-tests.d/haskell.yaml b/zuul-tests.d/haskell.yaml
index 5d55dcd83..2524028c0 100644
--- a/zuul-tests.d/haskell.yaml
+++ b/zuul-tests.d/haskell.yaml
@@ -11,8 +11,8 @@
     pre-run: test-playbooks/haskell/setup-project.yaml
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-haskell-stack-test
@@ -26,8 +26,8 @@
     pre-run: test-playbooks/haskell/setup-stack-project.yaml
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-hlint
@@ -43,8 +43,8 @@
       - test-playbooks/haskell/setup-project.yaml
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - project:
     check:
diff --git a/zuul-tests.d/nim-jobs.yaml b/zuul-tests.d/nim-jobs.yaml
index c49804de5..bcfc26cb0 100644
--- a/zuul-tests.d/nim-jobs.yaml
+++ b/zuul-tests.d/nim-jobs.yaml
@@ -64,14 +64,14 @@
           label: debian-bullseye
 
 - job:
-    name: zuul-jobs-test-nimble-fedora-34
-    description: Test the nimble job on fedora-34
+    name: zuul-jobs-test-nimble-fedora-35
+    description: Test the nimble job on fedora-35
     parent: zuul-jobs-test-nimble
     tags: auto-generated
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-nimble-opensuse-15
@@ -122,7 +122,7 @@
         - zuul-jobs-test-nimble-centos-8-stream
         - zuul-jobs-test-nimble-debian-buster
         - zuul-jobs-test-nimble-debian-bullseye
-        - zuul-jobs-test-nimble-fedora-34
+        - zuul-jobs-test-nimble-fedora-35
         - zuul-jobs-test-nimble-opensuse-15
         - zuul-jobs-test-nimble-opensuse-tumbleweed-nv
         - zuul-jobs-test-nimble-ubuntu-bionic
@@ -134,7 +134,7 @@
         - zuul-jobs-test-nimble-centos-8-stream
         - zuul-jobs-test-nimble-debian-buster
         - zuul-jobs-test-nimble-debian-bullseye
-        - zuul-jobs-test-nimble-fedora-34
+        - zuul-jobs-test-nimble-fedora-35
         - zuul-jobs-test-nimble-opensuse-15
         - zuul-jobs-test-nimble-ubuntu-bionic
         - zuul-jobs-test-nimble-ubuntu-focal
diff --git a/zuul-tests.d/packer-jobs.yaml b/zuul-tests.d/packer-jobs.yaml
index b518d4058..a737460ad 100644
--- a/zuul-tests.d/packer-jobs.yaml
+++ b/zuul-tests.d/packer-jobs.yaml
@@ -68,14 +68,14 @@
           label: debian-bullseye
 
 - job:
-    name: zuul-jobs-test-packer-fedora-34
-    description: Test packer job on fedora-34
+    name: zuul-jobs-test-packer-fedora-35
+    description: Test packer job on fedora-35
     parent: zuul-jobs-test-packer
     tags: auto-generated
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-packer-opensuse-15
@@ -126,7 +126,7 @@
         - zuul-jobs-test-packer-centos-8-stream
         - zuul-jobs-test-packer-debian-buster
         - zuul-jobs-test-packer-debian-bullseye
-        - zuul-jobs-test-packer-fedora-34
+        - zuul-jobs-test-packer-fedora-35
         - zuul-jobs-test-packer-opensuse-15
         - zuul-jobs-test-packer-opensuse-tumbleweed-nv
         - zuul-jobs-test-packer-ubuntu-bionic
@@ -138,7 +138,7 @@
         - zuul-jobs-test-packer-centos-8-stream
         - zuul-jobs-test-packer-debian-buster
         - zuul-jobs-test-packer-debian-bullseye
-        - zuul-jobs-test-packer-fedora-34
+        - zuul-jobs-test-packer-fedora-35
         - zuul-jobs-test-packer-opensuse-15
         - zuul-jobs-test-packer-ubuntu-bionic
         - zuul-jobs-test-packer-ubuntu-focal
diff --git a/zuul-tests.d/python-jobs.yaml b/zuul-tests.d/python-jobs.yaml
index f8a8e0cd3..7880ceda5 100644
--- a/zuul-tests.d/python-jobs.yaml
+++ b/zuul-tests.d/python-jobs.yaml
@@ -61,14 +61,14 @@
           label: debian-bullseye
 
 - job:
-    name: zuul-jobs-test-ensure-pip-fedora-34
-    description: Test the ensure-pip role on fedora-34
+    name: zuul-jobs-test-ensure-pip-fedora-35
+    description: Test the ensure-pip role on fedora-35
     parent: zuul-jobs-test-ensure-pip
     tags: auto-generated
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-ensure-pip-opensuse-15
@@ -180,14 +180,14 @@
           label: debian-bullseye
 
 - job:
-    name: zuul-jobs-test-ensure-tox-fedora-34
-    description: Test the ensure-tox role on fedora-34
+    name: zuul-jobs-test-ensure-tox-fedora-35
+    description: Test the ensure-tox role on fedora-35
     parent: zuul-jobs-test-ensure-tox
     tags: auto-generated
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-ensure-tox-opensuse-15
@@ -293,14 +293,14 @@
           label: debian-bullseye
 
 - job:
-    name: zuul-jobs-test-fetch-sphinx-tarball-fedora-34
-    description: Test the fetch-sphinx-tarball role on fedora-34
+    name: zuul-jobs-test-fetch-sphinx-tarball-fedora-35
+    description: Test the fetch-sphinx-tarball role on fedora-35
     parent: zuul-jobs-test-fetch-sphinx-tarball
     tags: auto-generated
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-fetch-sphinx-tarball-opensuse-15
@@ -453,7 +453,7 @@
         - zuul-jobs-test-ensure-pip-centos-8-stream
         - zuul-jobs-test-ensure-pip-debian-buster
         - zuul-jobs-test-ensure-pip-debian-bullseye
-        - zuul-jobs-test-ensure-pip-fedora-34
+        - zuul-jobs-test-ensure-pip-fedora-35
         - zuul-jobs-test-ensure-pip-opensuse-15
         - zuul-jobs-test-ensure-pip-opensuse-tumbleweed-nv
         - zuul-jobs-test-ensure-pip-ubuntu-bionic
@@ -464,7 +464,7 @@
         - zuul-jobs-test-ensure-tox-centos-8-stream
         - zuul-jobs-test-ensure-tox-debian-buster
         - zuul-jobs-test-ensure-tox-debian-bullseye
-        - zuul-jobs-test-ensure-tox-fedora-34
+        - zuul-jobs-test-ensure-tox-fedora-35
         - zuul-jobs-test-ensure-tox-opensuse-15
         - zuul-jobs-test-ensure-tox-opensuse-tumbleweed-nv
         - zuul-jobs-test-ensure-tox-ubuntu-bionic
@@ -474,7 +474,7 @@
         - zuul-jobs-test-fetch-sphinx-tarball-centos-8-stream
         - zuul-jobs-test-fetch-sphinx-tarball-debian-buster
         - zuul-jobs-test-fetch-sphinx-tarball-debian-bullseye
-        - zuul-jobs-test-fetch-sphinx-tarball-fedora-34
+        - zuul-jobs-test-fetch-sphinx-tarball-fedora-35
         - zuul-jobs-test-fetch-sphinx-tarball-opensuse-15
         - zuul-jobs-test-fetch-sphinx-tarball-opensuse-tumbleweed-nv
         - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-bionic
@@ -495,7 +495,7 @@
         - zuul-jobs-test-ensure-pip-centos-8-stream
         - zuul-jobs-test-ensure-pip-debian-buster
         - zuul-jobs-test-ensure-pip-debian-bullseye
-        - zuul-jobs-test-ensure-pip-fedora-34
+        - zuul-jobs-test-ensure-pip-fedora-35
         - zuul-jobs-test-ensure-pip-opensuse-15
         - zuul-jobs-test-ensure-pip-ubuntu-bionic
         - zuul-jobs-test-ensure-pip-ubuntu-focal
@@ -505,7 +505,7 @@
         - zuul-jobs-test-ensure-tox-centos-8-stream
         - zuul-jobs-test-ensure-tox-debian-buster
         - zuul-jobs-test-ensure-tox-debian-bullseye
-        - zuul-jobs-test-ensure-tox-fedora-34
+        - zuul-jobs-test-ensure-tox-fedora-35
         - zuul-jobs-test-ensure-tox-opensuse-15
         - zuul-jobs-test-ensure-tox-ubuntu-bionic
         - zuul-jobs-test-ensure-tox-ubuntu-focal
@@ -514,7 +514,7 @@
         - zuul-jobs-test-fetch-sphinx-tarball-centos-8-stream
         - zuul-jobs-test-fetch-sphinx-tarball-debian-buster
         - zuul-jobs-test-fetch-sphinx-tarball-debian-bullseye
-        - zuul-jobs-test-fetch-sphinx-tarball-fedora-34
+        - zuul-jobs-test-fetch-sphinx-tarball-fedora-35
         - zuul-jobs-test-fetch-sphinx-tarball-opensuse-15
         - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-bionic
         - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-focal
diff --git a/zuul-tests.d/python-roles-jobs.yaml b/zuul-tests.d/python-roles-jobs.yaml
index 6c7435614..1f498d840 100644
--- a/zuul-tests.d/python-roles-jobs.yaml
+++ b/zuul-tests.d/python-roles-jobs.yaml
@@ -63,14 +63,14 @@
           label: debian-bullseye
 
 - job:
-    name: zuul-jobs-test-build-python-release-jobs-fedora-34
-    description: Test the build-python-release-jobs role on fedora-34
+    name: zuul-jobs-test-build-python-release-jobs-fedora-35
+    description: Test the build-python-release-jobs role on fedora-35
     parent: zuul-jobs-test-build-python-release-jobs
     tags: auto-generated
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-build-python-release-jobs-opensuse-15
@@ -173,14 +173,14 @@
           label: debian-bullseye
 
 - job:
-    name: zuul-jobs-test-ensure-python-pyenv-fedora-34
-    description: Test the ensure-python role with pyenv on fedora-34
+    name: zuul-jobs-test-ensure-python-pyenv-fedora-35
+    description: Test the ensure-python role with pyenv on fedora-35
     parent: zuul-jobs-test-ensure-python-pyenv
     tags: auto-generated
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-ensure-python-pyenv-opensuse-15
@@ -231,7 +231,7 @@
         - zuul-jobs-test-build-python-release-jobs-centos-8-stream
         - zuul-jobs-test-build-python-release-jobs-debian-buster
         - zuul-jobs-test-build-python-release-jobs-debian-bullseye
-        - zuul-jobs-test-build-python-release-jobs-fedora-34
+        - zuul-jobs-test-build-python-release-jobs-fedora-35
         - zuul-jobs-test-build-python-release-jobs-opensuse-15
         - zuul-jobs-test-build-python-release-jobs-opensuse-tumbleweed-nv
         - zuul-jobs-test-build-python-release-jobs-ubuntu-bionic
@@ -241,7 +241,7 @@
         - zuul-jobs-test-ensure-python-pyenv-centos-8-stream
         - zuul-jobs-test-ensure-python-pyenv-debian-buster
         - zuul-jobs-test-ensure-python-pyenv-debian-bullseye
-        - zuul-jobs-test-ensure-python-pyenv-fedora-34
+        - zuul-jobs-test-ensure-python-pyenv-fedora-35
         - zuul-jobs-test-ensure-python-pyenv-opensuse-15
         - zuul-jobs-test-ensure-python-pyenv-opensuse-tumbleweed-nv
         - zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic
@@ -253,7 +253,7 @@
         - zuul-jobs-test-build-python-release-jobs-centos-8-stream
         - zuul-jobs-test-build-python-release-jobs-debian-buster
         - zuul-jobs-test-build-python-release-jobs-debian-bullseye
-        - zuul-jobs-test-build-python-release-jobs-fedora-34
+        - zuul-jobs-test-build-python-release-jobs-fedora-35
         - zuul-jobs-test-build-python-release-jobs-opensuse-15
         - zuul-jobs-test-build-python-release-jobs-ubuntu-bionic
         - zuul-jobs-test-build-python-release-jobs-ubuntu-focal
@@ -262,7 +262,7 @@
         - zuul-jobs-test-ensure-python-pyenv-centos-8-stream
         - zuul-jobs-test-ensure-python-pyenv-debian-buster
         - zuul-jobs-test-ensure-python-pyenv-debian-bullseye
-        - zuul-jobs-test-ensure-python-pyenv-fedora-34
+        - zuul-jobs-test-ensure-python-pyenv-fedora-35
         - zuul-jobs-test-ensure-python-pyenv-opensuse-15
         - zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic
         - zuul-jobs-test-ensure-python-pyenv-ubuntu-focal
diff --git a/zuul-tests.d/rust-jobs.yaml b/zuul-tests.d/rust-jobs.yaml
index 526a453a3..b470c9d14 100644
--- a/zuul-tests.d/rust-jobs.yaml
+++ b/zuul-tests.d/rust-jobs.yaml
@@ -65,14 +65,14 @@
           label: debian-bullseye
 
 - job:
-    name: zuul-jobs-test-rust-fedora-34
-    description: Test the rust roles on fedora-34
+    name: zuul-jobs-test-rust-fedora-35
+    description: Test the rust roles on fedora-35
     parent: zuul-jobs-test-rust
     tags: auto-generated
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-rust-opensuse-15
@@ -123,7 +123,7 @@
         - zuul-jobs-test-rust-centos-8-stream
         - zuul-jobs-test-rust-debian-buster
         - zuul-jobs-test-rust-debian-bullseye
-        - zuul-jobs-test-rust-fedora-34
+        - zuul-jobs-test-rust-fedora-35
         - zuul-jobs-test-rust-opensuse-15
         - zuul-jobs-test-rust-opensuse-tumbleweed-nv
         - zuul-jobs-test-rust-ubuntu-bionic
@@ -135,7 +135,7 @@
         - zuul-jobs-test-rust-centos-8-stream
         - zuul-jobs-test-rust-debian-buster
         - zuul-jobs-test-rust-debian-bullseye
-        - zuul-jobs-test-rust-fedora-34
+        - zuul-jobs-test-rust-fedora-35
         - zuul-jobs-test-rust-opensuse-15
         - zuul-jobs-test-rust-ubuntu-bionic
         - zuul-jobs-test-rust-ubuntu-focal
diff --git a/zuul-tests.d/terraform-jobs-roles.yaml b/zuul-tests.d/terraform-jobs-roles.yaml
index 5d4e103ad..1b5a371ef 100644
--- a/zuul-tests.d/terraform-jobs-roles.yaml
+++ b/zuul-tests.d/terraform-jobs-roles.yaml
@@ -70,14 +70,14 @@
           label: debian-bullseye
 
 - job:
-    name: zuul-jobs-test-terraform-fedora-34
-    description: Test terraform job on fedora-34
+    name: zuul-jobs-test-terraform-fedora-35
+    description: Test terraform job on fedora-35
     parent: zuul-jobs-test-terraform
     tags: auto-generated
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-terraform-opensuse-15
@@ -193,14 +193,14 @@
           label: debian-bullseye
 
 - job:
-    name: zuul-jobs-test-terraform-role-fedora-34
-    description: Test terraform roles on fedora-34
+    name: zuul-jobs-test-terraform-role-fedora-35
+    description: Test terraform roles on fedora-35
     parent: zuul-jobs-test-terraform-role
     tags: auto-generated
     nodeset:
       nodes:
-        - name: fedora-34
-          label: fedora-34
+        - name: fedora-35
+          label: fedora-35
 
 - job:
     name: zuul-jobs-test-terraform-role-opensuse-15
@@ -251,7 +251,7 @@
         - zuul-jobs-test-terraform-centos-8-stream
         - zuul-jobs-test-terraform-debian-buster
         - zuul-jobs-test-terraform-debian-bullseye
-        - zuul-jobs-test-terraform-fedora-34
+        - zuul-jobs-test-terraform-fedora-35
         - zuul-jobs-test-terraform-opensuse-15
         - zuul-jobs-test-terraform-ubuntu-bionic
         - zuul-jobs-test-terraform-ubuntu-focal
@@ -260,7 +260,7 @@
         - zuul-jobs-test-terraform-role-centos-8-stream
         - zuul-jobs-test-terraform-role-debian-buster
         - zuul-jobs-test-terraform-role-debian-bullseye
-        - zuul-jobs-test-terraform-role-fedora-34
+        - zuul-jobs-test-terraform-role-fedora-35
         - zuul-jobs-test-terraform-role-opensuse-15
         - zuul-jobs-test-terraform-role-ubuntu-bionic
         - zuul-jobs-test-terraform-role-ubuntu-focal