From 31616a477aec06686d10636d93a6e8a6fc4cd79c Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Aug 21 2023 17:18:59 +0000
Subject: Add Fedora 39, now it has branched


Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 4ea8f35..94b4205 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -19,6 +19,22 @@
 
 - job:
     name: rpm-install-test
+    description: "Install the built rpms (f39 variant)"
+    run: playbooks/rpm/rpm-install-test.yaml
+    branches:
+      - f39
+    nodeset: fedora-39-vm
+    requires:
+      - repo
+    roles:
+      - zuul: zuul-distro-jobs
+    vars:
+      repos:
+        - name: distro-build
+          url: https://kojipkgs.fedoraproject.org/repos/f39-build/latest/x86_64/
+
+- job:
+    name: rpm-install-test
     description: "Install the built rpms (f38 variant)"
     run: playbooks/rpm/rpm-install-test.yaml
     branches:
@@ -123,6 +139,25 @@
 
 - job:
     name: rpm-test
+    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:
+      - f39
+    nodeset: fedora-39-vm-medium
+    requires:
+      - repo
+    roles:
+      - zuul: zuul-distro-jobs
+    timeout: 18000
+    vars:
+      repos:
+        - name: distro-build
+          url: https://kojipkgs.fedoraproject.org/repos/f39-build/latest/x86_64/
+
+- job:
+    name: rpm-test
     description: "Install the built rpms and run STI tests (f38 variant)"
     run: playbooks/rpm/rpmtest.yaml
     post-run:
@@ -238,6 +273,20 @@
 - job:
     name: rpm-rpminspect
     parent: rpminspect
+    description: "Run the rpminspect report tests (f39 variant)"
+    branches:
+      - f39
+    nodeset: fedora-38-container
+    requires:
+      - repo
+    vars:
+      check_previous_build_enabled: true
+      rpminspect_cmd: rpminspect-fedora
+      target: f39
+
+- job:
+    name: rpm-rpminspect
+    parent: rpminspect
     description: "Run the rpminspect report tests (f38 variant)"
     branches:
       - f38
@@ -310,6 +359,7 @@
     parent: repo-rpm-lint
     branches:
       - rawhide
+      - f39
       - f38
       - f37
       - epel8
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 8a18447..5b8bd45 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -7,6 +7,12 @@
         name: container
 
 - nodeset:
+    name: fedora-39-container
+    nodes:
+      - label: zuul-worker-f39
+        name: container
+
+- nodeset:
     name: fedora-38-container
     nodes:
       - label: zuul-worker-f38
@@ -43,6 +49,12 @@
         name: cloud-host
 
 - nodeset:
+    name: fedora-39-vm
+    nodes:
+      - label: cloud-fedora-39-small
+        name: cloud-host
+
+- nodeset:
     name: fedora-38-vm
     nodes:
       - label: cloud-fedora-38-small
@@ -67,6 +79,12 @@
         name: cloud-host
 
 - nodeset:
+    name: fedora-39-vm-medium
+    nodes:
+      - label: cloud-fedora-39-medium
+        name: cloud-host
+
+- nodeset:
     name: fedora-38-vm-medium
     nodes:
       - label: cloud-fedora-38-medium