From 96eee1fd86d2cf8bf4008f610b13280acfda5f64 Mon Sep 17 00:00:00 2001
From: Daniel Pawlik <dpawlik@redhat.com>
Date: Feb 06 2025 10:07:31 +0000
Subject: Change default Fedora from 39 to 40


---

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index d5cacd2..006e4ba 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 (f40 variant)"
+    description: "Install the built rpms (f42 variant)"
     run: playbooks/rpm/rpm-install-test.yaml
     branches:
-      - f40
-    nodeset: fedora-40-vm
+      - f42
+    nodeset: fedora-42-vm
     requires:
       - repo
     roles:
@@ -31,7 +31,7 @@
     vars:
       repos:
         - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f40-build/latest/x86_64/
+          url: https://kojipkgs.fedoraproject.org/repos/f42-build/latest/x86_64/
 
 - job:
     name: rpm-install-test
@@ -51,11 +51,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:
@@ -63,7 +63,7 @@
     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
@@ -117,13 +117,13 @@
 
 - job:
     name: rpm-test
-    description: "Install the built rpms and run STI tests (f40 variant)"
+    description: "Install the built rpms and run STI tests (f42 variant)"
     run: playbooks/rpm/rpmtest.yaml
     post-run:
       - playbooks/rpm/rpmtest-fetch-artifacts.yaml
     branches:
-      - f40
-    nodeset: fedora-40-vm-medium
+      - f42
+    nodeset: fedora-42-vm-medium
     requires:
       - repo
     roles:
@@ -132,7 +132,7 @@
     vars:
       repos:
         - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f40-build/latest/x86_64/
+          url: https://kojipkgs.fedoraproject.org/repos/f42-build/latest/x86_64/
 
 - job:
     name: rpm-test
@@ -155,13 +155,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:
@@ -170,7 +170,7 @@
     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
@@ -230,16 +230,16 @@
 - job:
     name: rpm-rpminspect
     parent: rpminspect
-    description: "Run the rpminspect report tests (f40 variant)"
+    description: "Run the rpminspect report tests (f42 variant)"
     branches:
-      - f40
+      - f42
     nodeset: fedora-40-container
     requires:
       - repo
     vars:
       check_previous_build_enabled: true
       rpminspect_cmd: rpminspect-fedora
-      target: f40
+      target: f42
 
 - job:
     name: rpm-rpminspect
@@ -258,16 +258,16 @@
 - 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-40-container
     requires:
       - repo
     vars:
       check_previous_build_enabled: true
       rpminspect_cmd: rpminspect-fedora
-      target: f39
+      target: f40
 
 - job:
     name: rpm-rpminspect
@@ -302,9 +302,9 @@
     parent: repo-rpm-lint
     branches:
       - rawhide
-      - f40
+      - f42
       - f41
-      - f39
+      - f40
       - epel9
       - epel9-next
       - main
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 630b553..dc3fb32 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -3,7 +3,7 @@
 - nodeset:
     name: fedora-latest-container
     nodes:
-      - label: zuul-worker-f40
+      - label: zuul-worker-f41
         name: container
 
 - nodeset:
@@ -13,12 +13,6 @@
         name: container
 
 - nodeset:
-    name: fedora-39-container
-    nodes:
-      - label: zuul-worker-f39
-        name: container
-
-- nodeset:
     name: fedora-rawhide-vm
     nodes:
       - label: cloud-fedora-rawhide-small
@@ -27,7 +21,13 @@
 - nodeset:
     name: fedora-latest-vm
     nodes:
-      - label: cloud-fedora-40-small
+      - label: cloud-fedora-41-small
+        name: cloud-host
+
+- nodeset:
+    name: fedora-42-vm
+    nodes:
+      - label: cloud-fedora-42-small
         name: cloud-host
 
 - nodeset:
@@ -43,21 +43,21 @@
         name: cloud-host
 
 - nodeset:
-    name: fedora-39-vm
+    name: fedora-rawhide-vm-medium
     nodes:
-      - label: cloud-fedora-39-small
+      - label: cloud-fedora-rawhide-medium
         name: cloud-host
 
 - nodeset:
-    name: fedora-rawhide-vm-medium
+    name: fedora-latest-vm-medium
     nodes:
-      - label: cloud-fedora-rawhide-medium
+      - label: cloud-fedora-41-medium
         name: cloud-host
 
 - nodeset:
-    name: fedora-latest-vm-medium
+    name: fedora-42-vm-medium
     nodes:
-      - label: cloud-fedora-40-medium
+      - label: cloud-fedora-42-medium
         name: cloud-host
 
 - nodeset:
@@ -73,12 +73,6 @@
         name: cloud-host
 
 - nodeset:
-    name: fedora-39-vm-medium
-    nodes:
-      - label: cloud-fedora-39-medium
-        name: cloud-host
-
-- nodeset:
     name: centos-stream-9-vm
     nodes:
       - label: cloud-centos-9-stream