From 08164c571db23c8bb64c8c8c9eaa9d9d072852af Mon Sep 17 00:00:00 2001
From: Miroslav Vadkerti <mvadkert@redhat.com>
Date: Sep 01 2022 10:29:54 +0000
Subject: Onboard Fedora 37, drop Fedora 34


Depends-On: https://pagure.io/fedora-project-config/pull-request/217

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

---

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index aa3f371..51184b1 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -19,11 +19,11 @@
 
 - job:
     name: rpm-install-test
-    description: "Install the built rpms (f36 variant)"
+    description: "Install the built rpms (f37 variant)"
     run: playbooks/rpm/rpm-install-test.yaml
     branches:
-      - f36
-    nodeset: fedora-36-vm
+      - f37
+    nodeset: fedora-37-vm
     requires:
       - repo
     roles:
@@ -31,15 +31,15 @@
     vars:
       repos:
         - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f36-build/latest/x86_64/
+          url: https://kojipkgs.fedoraproject.org/repos/f37-build/latest/x86_64/
 
 - job:
     name: rpm-install-test
-    description: "Install the built rpms (f35 variant)"
+    description: "Install the built rpms (f36 variant)"
     run: playbooks/rpm/rpm-install-test.yaml
     branches:
-      - f35
-    nodeset: fedora-35-vm-medium
+      - f36
+    nodeset: fedora-36-vm
     requires:
       - repo
     roles:
@@ -47,15 +47,15 @@
     vars:
       repos:
         - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f35-build/latest/x86_64/
+          url: https://kojipkgs.fedoraproject.org/repos/f36-build/latest/x86_64/
 
 - job:
     name: rpm-install-test
-    description: "Install the built rpms (f34 variant)"
+    description: "Install the built rpms (f35 variant)"
     run: playbooks/rpm/rpm-install-test.yaml
     branches:
-      - f34
-    nodeset: fedora-34-container
+      - f35
+    nodeset: fedora-35-vm-medium
     requires:
       - repo
     roles:
@@ -63,7 +63,7 @@
     vars:
       repos:
         - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f34-build/latest/x86_64/
+          url: https://kojipkgs.fedoraproject.org/repos/f35-build/latest/x86_64/
 
 - job:
     name: rpm-install-test
@@ -123,13 +123,13 @@
 
 - job:
     name: rpm-test
-    description: "Install the built rpms and run STI tests (f36 variant)"
+    description: "Install the built rpms and run STI tests (f37 variant)"
     run: playbooks/rpm/rpmtest.yaml
     post-run:
       - playbooks/rpm/rpmtest-fetch-artifacts.yaml
     branches:
-      - f36
-    nodeset: fedora-36-vm-medium
+      - f37
+    nodeset: fedora-37-vm-medium
     requires:
       - repo
     roles:
@@ -138,17 +138,17 @@
     vars:
       repos:
         - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f36-build/latest/x86_64/
+          url: https://kojipkgs.fedoraproject.org/repos/f37-build/latest/x86_64/
 
 - job:
     name: rpm-test
-    description: "Install the built rpms and run STI tests (f35 variant)"
+    description: "Install the built rpms and run STI tests (f36 variant)"
     run: playbooks/rpm/rpmtest.yaml
     post-run:
       - playbooks/rpm/rpmtest-fetch-artifacts.yaml
     branches:
-      - f35
-    nodeset: fedora-35-vm-medium
+      - f36
+    nodeset: fedora-36-vm-medium
     requires:
       - repo
     roles:
@@ -157,17 +157,17 @@
     vars:
       repos:
         - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f35-build/latest/x86_64/
+          url: https://kojipkgs.fedoraproject.org/repos/f36-build/latest/x86_64/
 
 - job:
     name: rpm-test
-    description: "Install the built rpms and run STI tests (f34 variant)"
+    description: "Install the built rpms and run STI tests (f35 variant)"
     run: playbooks/rpm/rpmtest.yaml
     post-run:
       - playbooks/rpm/rpmtest-fetch-artifacts.yaml
     branches:
-      - f34
-    nodeset: fedora-34-vm-medium
+      - f35
+    nodeset: fedora-35-vm-medium
     requires:
       - repo
     roles:
@@ -176,7 +176,7 @@
     vars:
       repos:
         - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f34-build/latest/x86_64/
+          url: https://kojipkgs.fedoraproject.org/repos/f35-build/latest/x86_64/
 
 - job:
     name: rpm-test
@@ -238,44 +238,44 @@
 - job:
     name: rpm-rpminspect
     parent: rpminspect
-    description: "Run the rpminspect report tests (f36 variant)"
+    description: "Run the rpminspect report tests (f37 variant)"
     branches:
-      - f36
+      - f37
     nodeset: fedora-36-container
     requires:
       - repo
     vars:
       check_previous_build_enabled: true
       rpminspect_cmd: rpminspect-fedora
-      target: f36
+      target: f37
 
 - job:
     name: rpm-rpminspect
     parent: rpminspect
-    description: "Run the rpminspect report tests (f35 variant)"
+    description: "Run the rpminspect report tests (f36 variant)"
     branches:
-      - f35
+      - f36
     nodeset: fedora-36-container
     requires:
       - repo
     vars:
       check_previous_build_enabled: true
       rpminspect_cmd: rpminspect-fedora
-      target: f35
+      target: f36
 
 - job:
     name: rpm-rpminspect
     parent: rpminspect
-    description: "Run the rpminspect report tests (f34 variant)"
+    description: "Run the rpminspect report tests (f35 variant)"
     branches:
-      - f34
+      - f35
     nodeset: fedora-36-container
     requires:
       - repo
     vars:
       check_previous_build_enabled: true
       rpminspect_cmd: rpminspect-fedora
-      target: f34
+      target: f35
 
 - job:
     name: rpm-rpminspect
@@ -310,9 +310,9 @@
     parent: repo-rpm-lint
     branches:
       - rawhide
+      - f37
       - f36
       - f35
-      - f34
       - epel8
       - epel9
       - main
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index adac159..caeceb9 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -7,6 +7,12 @@
         name: container
 
 - nodeset:
+    name: fedora-37-container
+    nodes:
+      - label: zuul-worker-f37
+        name: container
+
+- nodeset:
     name: fedora-36-container
     nodes:
       - label: zuul-worker-f36
@@ -73,6 +79,12 @@
         name: cloud-host
 
 - nodeset:
+    name: fedora-37-vm
+    nodes:
+      - label: cloud-fedora-37-small
+        name: cloud-host
+
+- nodeset:
     name: fedora-36-vm
     nodes:
       - label: cloud-fedora-36-small
@@ -127,6 +139,12 @@
         name: cloud-host
 
 - nodeset:
+    name: fedora-37-vm-medium
+    nodes:
+      - label: cloud-fedora-37-medium
+        name: cloud-host
+
+- nodeset:
     name: fedora-36-vm-medium
     nodes:
       - label: cloud-fedora-36-medium