From bf621194c29681461875b7b38bdcb919eb24154c Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Feb 27 2024 17:57:12 +0000
Subject: Add support for f40 and remove f37


---

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 1b9ae5f..a2b26ec 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 (f39 variant)"
+    description: "Install the built rpms (f40 variant)"
     run: playbooks/rpm/rpm-install-test.yaml
     branches:
-      - f39
-    nodeset: fedora-39-vm
+      - f40
+    nodeset: fedora-40-vm
     requires:
       - repo
     roles:
@@ -31,15 +31,15 @@
     vars:
       repos:
         - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f39-build/latest/x86_64/
+          url: https://kojipkgs.fedoraproject.org/repos/f40-build/latest/x86_64/
 
 - job:
     name: rpm-install-test
-    description: "Install the built rpms (f38 variant)"
+    description: "Install the built rpms (f39 variant)"
     run: playbooks/rpm/rpm-install-test.yaml
     branches:
-      - f38
-    nodeset: fedora-38-vm
+      - f39
+    nodeset: fedora-39-vm
     requires:
       - repo
     roles:
@@ -47,15 +47,15 @@
     vars:
       repos:
         - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f38-build/latest/x86_64/
+          url: https://kojipkgs.fedoraproject.org/repos/f39-build/latest/x86_64/
 
 - job:
     name: rpm-install-test
-    description: "Install the built rpms (f37 variant)"
+    description: "Install the built rpms (f38 variant)"
     run: playbooks/rpm/rpm-install-test.yaml
     branches:
-      - f37
-    nodeset: fedora-37-vm
+      - f38
+    nodeset: fedora-38-vm
     requires:
       - repo
     roles:
@@ -63,7 +63,7 @@
     vars:
       repos:
         - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f37-build/latest/x86_64/
+          url: https://kojipkgs.fedoraproject.org/repos/f38-build/latest/x86_64/
 
 - job:
     name: rpm-install-test
@@ -131,13 +131,13 @@
 
 - job:
     name: rpm-test
-    description: "Install the built rpms and run STI tests (f39 variant)"
+    description: "Install the built rpms and run STI tests (f40 variant)"
     run: playbooks/rpm/rpmtest.yaml
     post-run:
       - playbooks/rpm/rpmtest-fetch-artifacts.yaml
     branches:
-      - f39
-    nodeset: fedora-39-vm-medium
+      - f40
+    nodeset: fedora-40-vm-medium
     requires:
       - repo
     roles:
@@ -146,17 +146,17 @@
     vars:
       repos:
         - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f39-build/latest/x86_64/
+          url: https://kojipkgs.fedoraproject.org/repos/f40-build/latest/x86_64/
 
 - job:
     name: rpm-test
-    description: "Install the built rpms and run STI tests (f38 variant)"
+    description: "Install the built rpms and run STI tests (f39 variant)"
     run: playbooks/rpm/rpmtest.yaml
     post-run:
       - playbooks/rpm/rpmtest-fetch-artifacts.yaml
     branches:
-      - f38
-    nodeset: fedora-38-vm-medium
+      - f39
+    nodeset: fedora-39-vm-medium
     requires:
       - repo
     roles:
@@ -165,17 +165,17 @@
     vars:
       repos:
         - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f38-build/latest/x86_64/
+          url: https://kojipkgs.fedoraproject.org/repos/f39-build/latest/x86_64/
 
 - job:
     name: rpm-test
-    description: "Install the built rpms and run STI tests (f37 variant)"
+    description: "Install the built rpms and run STI tests (f38 variant)"
     run: playbooks/rpm/rpmtest.yaml
     post-run:
       - playbooks/rpm/rpmtest-fetch-artifacts.yaml
     branches:
-      - f37
-    nodeset: fedora-37-vm-medium
+      - f38
+    nodeset: fedora-38-vm-medium
     requires:
       - repo
     roles:
@@ -184,7 +184,7 @@
     vars:
       repos:
         - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f37-build/latest/x86_64/
+          url: https://kojipkgs.fedoraproject.org/repos/f38-build/latest/x86_64/
 
 - job:
     name: rpm-test
@@ -265,44 +265,44 @@
 - job:
     name: rpm-rpminspect
     parent: rpminspect
-    description: "Run the rpminspect report tests (f39 variant)"
+    description: "Run the rpminspect report tests (f40 variant)"
     branches:
-      - f39
+      - f40
     nodeset: fedora-38-container
     requires:
       - repo
     vars:
       check_previous_build_enabled: true
       rpminspect_cmd: rpminspect-fedora
-      target: f39
+      target: f40
 
 - job:
     name: rpm-rpminspect
     parent: rpminspect
-    description: "Run the rpminspect report tests (f38 variant)"
+    description: "Run the rpminspect report tests (f39 variant)"
     branches:
-      - f38
+      - f39
     nodeset: fedora-38-container
     requires:
       - repo
     vars:
       check_previous_build_enabled: true
       rpminspect_cmd: rpminspect-fedora
-      target: f38
+      target: f39
 
 - job:
     name: rpm-rpminspect
     parent: rpminspect
-    description: "Run the rpminspect report tests (f37 variant)"
+    description: "Run the rpminspect report tests (f38 variant)"
     branches:
-      - f37
+      - f38
     nodeset: fedora-38-container
     requires:
       - repo
     vars:
       check_previous_build_enabled: true
       rpminspect_cmd: rpminspect-fedora
-      target: f37
+      target: f38
 
 - job:
     name: rpm-rpminspect
@@ -351,9 +351,9 @@
     parent: repo-rpm-lint
     branches:
       - rawhide
+      - f40
       - f39
       - f38
-      - f37
       - epel8
       - epel9
       - epel9-next
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 5b8bd45..319bf80 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -49,6 +49,12 @@
         name: cloud-host
 
 - nodeset:
+    name: fedora-40-vm
+    nodes:
+      - label: cloud-fedora-40-small
+        name: cloud-host
+
+- nodeset:
     name: fedora-39-vm
     nodes:
       - label: cloud-fedora-39-small
@@ -79,6 +85,12 @@
         name: cloud-host
 
 - nodeset:
+    name: fedora-40-vm-medium
+    nodes:
+      - label: cloud-fedora-40-medium
+        name: cloud-host
+
+- nodeset:
     name: fedora-39-vm-medium
     nodes:
       - label: cloud-fedora-39-medium