From 4032712e720602d180c52cc527a172db9a83ba36 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Aug 21 2023 17:08:24 +0000
Subject: Add Fedora 39, now it has branched


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

---

diff --git a/FZCI.dhall/Branches.dhall b/FZCI.dhall/Branches.dhall
index b9d898e..f4e9577 100644
--- a/FZCI.dhall/Branches.dhall
+++ b/FZCI.dhall/Branches.dhall
@@ -4,12 +4,13 @@ let Arches = ./Arches.dhall
 
 let --| When changing that union, update the `all` attribute too
     Union =
-      < Rawhide | F37 | F38 | Epel8 | Epel9 | Epel9Next >
+      < Rawhide | F37 | F38 | F39 | Epel8 | Epel9 | Epel9Next >
 
 let eq_def =
       { Rawhide = False
       , F37 = False
       , F38 = False
+      , F39 = False
       , Epel8 = False
       , Epel9 = False
       , Epel9Next = False
@@ -21,6 +22,7 @@ let show =
           { Rawhide = "rawhide"
           , F37 = "f37"
           , F38 = "f38"
+          , F39 = "f39"
           , Epel8 = "epel8"
           , Epel9 = "epel9"
           , Epel9Next = "epel9-next"
@@ -29,6 +31,7 @@ let show =
 
 let all =
       [ Union.Rawhide
+      , Union.F39
       , Union.F38
       , Union.F37
       , Union.Epel8
@@ -58,6 +61,7 @@ in  { Type = Union
             { Rawhide = "rawhide"
             , F37 = "f37"
             , F38 = "f38"
+            , F39 = "f39"
             , Epel8 = "epel8"
             , Epel9 = "epel9"
             , Epel9Next = "epel9-next"
@@ -69,6 +73,7 @@ in  { Type = Union
             { Rawhide = Arches.fedora
             , F37 = Arches.fedora
             , F38 = Arches.fedora
+            , F39 = Arches.fedora
             , Epel8 = Arches.epel8
             , Epel9 = Arches.epel9
             , Epel9Next = Arches.epel9Next
@@ -83,6 +88,8 @@ in  { Type = Union
                 "https://kojipkgs.fedoraproject.org/repos/f37-build/latest/x86_64/"
             , F38 =
                 "https://kojipkgs.fedoraproject.org/repos/f38-build/latest/x86_64/"
+            , F39 =
+                "https://kojipkgs.fedoraproject.org/repos/f39-build/latest/x86_64/"
             , Epel8 =
                 "https://kojipkgs.fedoraproject.org/repos/epel8-build/latest/x86_64/"
             , Epel9 =
diff --git a/FZCI.dhall/Nodesets.dhall b/FZCI.dhall/Nodesets.dhall
index 95f9813..5e7a1c4 100644
--- a/FZCI.dhall/Nodesets.dhall
+++ b/FZCI.dhall/Nodesets.dhall
@@ -5,16 +5,19 @@ let latest-version = "38"
 let Nodeset =
       let Union =
             < Fedora-Latest-Container
+            | Fedora-39-Container
             | Fedora-38-Container
             | Fedora-37-Container
             | Centos-8-Container
             | Centos-7-Container
             | Fedora-Rawhide-VM
             | Fedora-Latest-VM
+            | Fedora-39-VM
             | Fedora-38-VM
             | Fedora-37-VM
             | Fedora-Rawhide-VM-Medium
             | Fedora-Latest-VM-Medium
+            | Fedora-39-VM-Medium
             | Fedora-38-VM-Medium
             | Fedora-37-VM-Medium
             | Centos-8-VM
@@ -23,16 +26,19 @@ let Nodeset =
 
       let all =
             [ Union.Fedora-Latest-Container
+            , Union.Fedora-39-Container
             , Union.Fedora-38-Container
             , Union.Fedora-37-Container
             , Union.Centos-8-Container
             , Union.Centos-7-Container
             , Union.Fedora-Rawhide-VM
             , Union.Fedora-Latest-VM
+            , Union.Fedora-39-VM
             , Union.Fedora-38-VM
             , Union.Fedora-37-VM
             , Union.Fedora-Rawhide-VM-Medium
             , Union.Fedora-Latest-VM-Medium
+            , Union.Fedora-39-VM-Medium
             , Union.Fedora-38-VM-Medium
             , Union.Fedora-37-VM-Medium
             , Union.Centos-8-VM
@@ -58,6 +64,8 @@ let Nodeset =
                       "fedora-latest-container"
                       "zuul-worker-f${latest-version}"
                       "container"
+                , Fedora-39-Container =
+                    create "fedora-39-container" "zuul-worker-f39" "container"
                 , Fedora-38-Container =
                     create "fedora-38-container" "zuul-worker-f38" "container"
                 , Fedora-37-Container =
@@ -76,6 +84,8 @@ let Nodeset =
                       "fedora-latest-vm"
                       "cloud-fedora-${latest-version}-small"
                       "cloud-host"
+                , Fedora-39-VM =
+                    create "fedora-39-vm" "cloud-fedora-39-small" "cloud-host"
                 , Fedora-38-VM =
                     create "fedora-38-vm" "cloud-fedora-38-small" "cloud-host"
                 , Fedora-37-VM =
@@ -90,6 +100,11 @@ let Nodeset =
                       "fedora-latest-vm-medium"
                       "cloud-fedora-${latest-version}-medium"
                       "cloud-host"
+                , Fedora-39-VM-Medium =
+                    create
+                      "fedora-39-vm-medium"
+                      "cloud-fedora-39-medium"
+                      "cloud-host"
                 , Fedora-38-VM-Medium =
                     create
                       "fedora-38-vm-medium"
diff --git a/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall b/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall
index 6f0ff62..27e5715 100644
--- a/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall
+++ b/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall
@@ -245,6 +245,7 @@ let getTestingFarmJobVars =
                 { Rawhide = "Fedora-Rawhide"
                 , F37 = "Fedora-37"
                 , F38 = "Fedora-38"
+                , F39 = "Fedora-39"
                 , Epel8 = "CentOS-Stream-8"
                 , Epel9 = "CentOS-Stream-9"
                 , Epel9Next = "CentOS-Stream-9"
@@ -256,6 +257,7 @@ let getTestingFarmJobVars =
                 { Rawhide = "fedora-rawhide"
                 , F37 = "fedora-37"
                 , F38 = "fedora-38"
+                , F39 = "fedora-39"
                 , Epel8 = "centos-stream-8"
                 , Epel9 = "centos-stream-9"
                 , Epel9Next = "centos-stream-9"
diff --git a/FZCI.dhall/fedora-zuul-jobs/jobs.dhall b/FZCI.dhall/fedora-zuul-jobs/jobs.dhall
index 4feee41..1a9f217 100644
--- a/FZCI.dhall/fedora-zuul-jobs/jobs.dhall
+++ b/FZCI.dhall/fedora-zuul-jobs/jobs.dhall
@@ -37,6 +37,7 @@ let createRpmInstallTestJob
                   { Rawhide = Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM
                   , F37 = Nodesets.getName Nodesets.Type.Fedora-37-VM
                   , F38 = Nodesets.getName Nodesets.Type.Fedora-38-VM
+                  , F39 = Nodesets.getName Nodesets.Type.Fedora-39-VM
                   , Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM
                   , Epel9 = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM
                   , Epel9Next =
@@ -79,6 +80,7 @@ let createRpmTestJob
                       Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM-Medium
                   , F37 = Nodesets.getName Nodesets.Type.Fedora-37-VM-Medium
                   , F38 = Nodesets.getName Nodesets.Type.Fedora-38-VM-Medium
+                  , F39 = Nodesets.getName Nodesets.Type.Fedora-39-VM-Medium
                   , Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM
                   , Epel9 = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM
                   , Epel9Next =