From 3356dfe8f0aede95a5bc2bfd70c060e0b6f204ea Mon Sep 17 00:00:00 2001
From: Miroslav Vadkerti <mvadkert@redhat.com>
Date: Aug 16 2022 09:41:42 +0000
Subject: Onboard Fedora 37, drop Fedora 34


Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

---

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 7b5ae7f..ac094e4 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -18,9 +18,9 @@
     run: playbooks/rpm/check-for-tests.yaml
     branches:
       - rawhide
+      - f37
       - f36
       - f35
-      - f34
       - epel8
       - epel9
       - main
@@ -33,9 +33,9 @@
     run: playbooks/rpm/check-for-sti-tests.yaml
     branches:
       - rawhide
+      - f37
       - f36
       - f35
-      - f34
       - epel8
       - epel9
       - main
@@ -48,9 +48,9 @@
     run: playbooks/rpm/check-for-fmf-tests.yaml
     branches:
       - rawhide
+      - f37
       - f36
       - f35
-      - f34
       - epel8
       - epel9
       - main
@@ -63,9 +63,9 @@
     run: playbooks/rpm/check-for-arches.yaml
     branches:
       - rawhide
+      - f37
       - f36
       - f35
-      - f34
       - epel8
       - epel9
       - main
@@ -177,271 +177,271 @@
     name: rpm-scratch-build
     parent: common-koji-rpm-build
     branches:
-      - f36
+      - f37
     final: true
     provides:
       - repo
     vars:
       arches: x86_64
       fetch_artifacts: true
-      release: f36
+      release: f37
       scratch_build: true
-      target: f36
+      target: f37
 
 - job:
     name: rpm-scratch-build-s390x
     parent: common-koji-rpm-build
     branches:
-      - f36
+      - f37
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: s390x
       fetch_artifacts: false
-      release: f36
+      release: f37
       scratch_build: true
-      target: f36
+      target: f37
 
 - job:
     name: rpm-scratch-build-ppc64le
     parent: common-koji-rpm-build
     branches:
-      - f36
+      - f37
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: ppc64le
       fetch_artifacts: false
-      release: f36
+      release: f37
       scratch_build: true
-      target: f36
+      target: f37
 
 - job:
     name: rpm-scratch-build-i686
     parent: common-koji-rpm-build
     branches:
-      - f36
+      - f37
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: i686
       fetch_artifacts: false
-      release: f36
+      release: f37
       scratch_build: true
-      target: f36
+      target: f37
 
 - job:
     name: rpm-scratch-build-armv7hl
     parent: common-koji-rpm-build
     branches:
-      - f36
+      - f37
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: armv7hl
       fetch_artifacts: false
-      release: f36
+      release: f37
       scratch_build: true
-      target: f36
+      target: f37
 
 - job:
     name: rpm-scratch-build-aarch64
     parent: common-koji-rpm-build
     branches:
-      - f36
+      - f37
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: aarch64
       fetch_artifacts: false
-      release: f36
+      release: f37
       scratch_build: true
-      target: f36
+      target: f37
 
 - job:
     name: rpm-scratch-build
     parent: common-koji-rpm-build
     branches:
-      - f35
+      - f36
     final: true
     provides:
       - repo
     vars:
       arches: x86_64
       fetch_artifacts: true
-      release: f35
+      release: f36
       scratch_build: true
-      target: f35
+      target: f36
 
 - job:
     name: rpm-scratch-build-s390x
     parent: common-koji-rpm-build
     branches:
-      - f35
+      - f36
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: s390x
       fetch_artifacts: false
-      release: f35
+      release: f36
       scratch_build: true
-      target: f35
+      target: f36
 
 - job:
     name: rpm-scratch-build-ppc64le
     parent: common-koji-rpm-build
     branches:
-      - f35
+      - f36
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: ppc64le
       fetch_artifacts: false
-      release: f35
+      release: f36
       scratch_build: true
-      target: f35
+      target: f36
 
 - job:
     name: rpm-scratch-build-i686
     parent: common-koji-rpm-build
     branches:
-      - f35
+      - f36
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: i686
       fetch_artifacts: false
-      release: f35
+      release: f36
       scratch_build: true
-      target: f35
+      target: f36
 
 - job:
     name: rpm-scratch-build-armv7hl
     parent: common-koji-rpm-build
     branches:
-      - f35
+      - f36
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: armv7hl
       fetch_artifacts: false
-      release: f35
+      release: f36
       scratch_build: true
-      target: f35
+      target: f36
 
 - job:
     name: rpm-scratch-build-aarch64
     parent: common-koji-rpm-build
     branches:
-      - f35
+      - f36
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: aarch64
       fetch_artifacts: false
-      release: f35
+      release: f36
       scratch_build: true
-      target: f35
+      target: f36
 
 - job:
     name: rpm-scratch-build
     parent: common-koji-rpm-build
     branches:
-      - f34
+      - f35
     final: true
     provides:
       - repo
     vars:
       arches: x86_64
       fetch_artifacts: true
-      release: f34
+      release: f35
       scratch_build: true
-      target: f34
+      target: f35
 
 - job:
     name: rpm-scratch-build-s390x
     parent: common-koji-rpm-build
     branches:
-      - f34
+      - f35
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: s390x
       fetch_artifacts: false
-      release: f34
+      release: f35
       scratch_build: true
-      target: f34
+      target: f35
 
 - job:
     name: rpm-scratch-build-ppc64le
     parent: common-koji-rpm-build
     branches:
-      - f34
+      - f35
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: ppc64le
       fetch_artifacts: false
-      release: f34
+      release: f35
       scratch_build: true
-      target: f34
+      target: f35
 
 - job:
     name: rpm-scratch-build-i686
     parent: common-koji-rpm-build
     branches:
-      - f34
+      - f35
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: i686
       fetch_artifacts: false
-      release: f34
+      release: f35
       scratch_build: true
-      target: f34
+      target: f35
 
 - job:
     name: rpm-scratch-build-armv7hl
     parent: common-koji-rpm-build
     branches:
-      - f34
+      - f35
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: armv7hl
       fetch_artifacts: false
-      release: f34
+      release: f35
       scratch_build: true
-      target: f34
+      target: f35
 
 - job:
     name: rpm-scratch-build-aarch64
     parent: common-koji-rpm-build
     branches:
-      - f34
+      - f35
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: aarch64
       fetch_artifacts: false
-      release: f34
+      release: f35
       scratch_build: true
-      target: f34
+      target: f35
 
 - job:
     name: rpm-scratch-build
@@ -550,37 +550,37 @@
     name: rpm-build
     parent: common-koji-rpm-build
     branches:
-      - f36
+      - f37
     final: true
     vars:
       fetch_artifacts: false
-      release: f36
+      release: f37
       scratch_build: false
-      target: f36
+      target: f37
 
 - job:
     name: rpm-build
     parent: common-koji-rpm-build
     branches:
-      - f35
+      - f36
     final: true
     vars:
       fetch_artifacts: false
-      release: f35
+      release: f36
       scratch_build: false
-      target: f35
+      target: f36
 
 - job:
     name: rpm-build
     parent: common-koji-rpm-build
     branches:
-      - f34
+      - f35
     final: true
     vars:
       fetch_artifacts: false
-      release: f34
+      release: f35
       scratch_build: false
-      target: f34
+      target: f35
 
 - job:
     name: rpm-build
@@ -638,7 +638,7 @@
     post-run:
       - playbooks/testing-farm/fetch.yaml
     branches:
-      - f36
+      - f37
     final: true
     nodeset: fedora-36-container
     requires:
@@ -651,8 +651,8 @@
         secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
-      compose: Fedora-36
-      distro: fedora-36
+      compose: Fedora-37
+      distro: fedora-37
       test_type: fmf
 
 - job:
@@ -662,7 +662,7 @@
     post-run:
       - playbooks/testing-farm/fetch.yaml
     branches:
-      - f35
+      - f36
     final: true
     nodeset: fedora-36-container
     requires:
@@ -675,8 +675,8 @@
         secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
-      compose: Fedora-35
-      distro: fedora-35
+      compose: Fedora-36
+      distro: fedora-36
       test_type: fmf
 
 - job:
@@ -686,7 +686,7 @@
     post-run:
       - playbooks/testing-farm/fetch.yaml
     branches:
-      - f34
+      - f35
     final: true
     nodeset: fedora-36-container
     requires:
@@ -699,8 +699,8 @@
         secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
-      compose: Fedora-34
-      distro: fedora-34
+      compose: Fedora-35
+      distro: fedora-35
       test_type: fmf
 
 - job:
@@ -783,7 +783,7 @@
     post-run:
       - playbooks/testing-farm/fetch.yaml
     branches:
-      - f36
+      - f37
     final: true
     nodeset: fedora-36-container
     requires:
@@ -796,8 +796,8 @@
         secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
-      compose: Fedora-36
-      distro: fedora-36
+      compose: Fedora-37
+      distro: fedora-37
       test_type: sti
 
 - job:
@@ -807,7 +807,7 @@
     post-run:
       - playbooks/testing-farm/fetch.yaml
     branches:
-      - f35
+      - f36
     final: true
     nodeset: fedora-36-container
     requires:
@@ -820,8 +820,8 @@
         secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
-      compose: Fedora-35
-      distro: fedora-35
+      compose: Fedora-36
+      distro: fedora-36
       test_type: sti
 
 - job:
@@ -831,7 +831,7 @@
     post-run:
       - playbooks/testing-farm/fetch.yaml
     branches:
-      - f34
+      - f35
     final: true
     nodeset: fedora-36-container
     requires:
@@ -844,8 +844,8 @@
         secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
-      compose: Fedora-34
-      distro: fedora-34
+      compose: Fedora-35
+      distro: fedora-35
       test_type: sti
 
 - job:

