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


---

diff --git a/FZCI.dhall/Branches.dhall b/FZCI.dhall/Branches.dhall
index f4e9577..372c147 100644
--- a/FZCI.dhall/Branches.dhall
+++ b/FZCI.dhall/Branches.dhall
@@ -4,13 +4,13 @@ let Arches = ./Arches.dhall
 
 let --| When changing that union, update the `all` attribute too
     Union =
-      < Rawhide | F37 | F38 | F39 | Epel8 | Epel9 | Epel9Next >
+      < Rawhide | F38 | F39 | F40 | Epel8 | Epel9 | Epel9Next >
 
 let eq_def =
       { Rawhide = False
-      , F37 = False
       , F38 = False
       , F39 = False
+      , F40 = False
       , Epel8 = False
       , Epel9 = False
       , Epel9Next = False
@@ -20,9 +20,9 @@ let show =
       λ(branch : Union) →
         merge
           { Rawhide = "rawhide"
-          , F37 = "f37"
           , F38 = "f38"
           , F39 = "f39"
+          , F40 = "f40"
           , Epel8 = "epel8"
           , Epel9 = "epel9"
           , Epel9Next = "epel9-next"
@@ -31,9 +31,9 @@ let show =
 
 let all =
       [ Union.Rawhide
+      , Union.F40
       , Union.F39
       , Union.F38
-      , Union.F37
       , Union.Epel8
       , Union.Epel9
       , Union.Epel9Next
@@ -59,9 +59,9 @@ in  { Type = Union
         λ(branch : Union) →
           merge
             { Rawhide = "rawhide"
-            , F37 = "f37"
             , F38 = "f38"
             , F39 = "f39"
+            , F40 = "f40"
             , Epel8 = "epel8"
             , Epel9 = "epel9"
             , Epel9Next = "epel9-next"
@@ -71,9 +71,9 @@ in  { Type = Union
         λ(branch : Union) →
           merge
             { Rawhide = Arches.fedora
-            , F37 = Arches.fedora
             , F38 = Arches.fedora
             , F39 = Arches.fedora
+            , F40 = Arches.fedora
             , Epel8 = Arches.epel8
             , Epel9 = Arches.epel9
             , Epel9Next = Arches.epel9Next
@@ -84,8 +84,8 @@ in  { Type = Union
           merge
             { Rawhide =
                 "https://kojipkgs.fedoraproject.org/repos/rawhide/latest/x86_64/"
-            , F37 =
-                "https://kojipkgs.fedoraproject.org/repos/f37-build/latest/x86_64/"
+            , F40 =
+                "https://kojipkgs.fedoraproject.org/repos/f40-build/latest/x86_64/"
             , F38 =
                 "https://kojipkgs.fedoraproject.org/repos/f38-build/latest/x86_64/"
             , F39 =
diff --git a/FZCI.dhall/Nodesets.dhall b/FZCI.dhall/Nodesets.dhall
index 5e7a1c4..e2c5f50 100644
--- a/FZCI.dhall/Nodesets.dhall
+++ b/FZCI.dhall/Nodesets.dhall
@@ -12,11 +12,13 @@ let Nodeset =
             | Centos-7-Container
             | Fedora-Rawhide-VM
             | Fedora-Latest-VM
+            | Fedora-40-VM
             | Fedora-39-VM
             | Fedora-38-VM
             | Fedora-37-VM
             | Fedora-Rawhide-VM-Medium
             | Fedora-Latest-VM-Medium
+            | Fedora-40-VM-Medium
             | Fedora-39-VM-Medium
             | Fedora-38-VM-Medium
             | Fedora-37-VM-Medium
@@ -33,11 +35,13 @@ let Nodeset =
             , Union.Centos-7-Container
             , Union.Fedora-Rawhide-VM
             , Union.Fedora-Latest-VM
+            , Union.Fedora-40-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-40-VM-Medium
             , Union.Fedora-39-VM-Medium
             , Union.Fedora-38-VM-Medium
             , Union.Fedora-37-VM-Medium
@@ -84,6 +88,8 @@ let Nodeset =
                       "fedora-latest-vm"
                       "cloud-fedora-${latest-version}-small"
                       "cloud-host"
+                , Fedora-40-VM =
+                    create "fedora-40-vm" "cloud-fedora-40-small" "cloud-host"
                 , Fedora-39-VM =
                     create "fedora-39-vm" "cloud-fedora-39-small" "cloud-host"
                 , Fedora-38-VM =
@@ -100,6 +106,11 @@ let Nodeset =
                       "fedora-latest-vm-medium"
                       "cloud-fedora-${latest-version}-medium"
                       "cloud-host"
+                , Fedora-40-VM-Medium =
+                    create
+                      "fedora-40-vm-medium"
+                      "cloud-fedora-40-medium"
+                      "cloud-host"
                 , Fedora-39-VM-Medium =
                     create
                       "fedora-39-vm-medium"
diff --git a/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall b/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall
index e7cd903..ede2019 100644
--- a/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall
+++ b/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall
@@ -243,9 +243,9 @@ let getTestingFarmJobVars =
         let name =
               merge
                 { Rawhide = "Fedora-Rawhide"
-                , F37 = "Fedora-37"
                 , F38 = "Fedora-38"
                 , F39 = "Fedora-39"
+                , F40 = "Fedora-40"
                 , Epel8 = "CentOS-Stream-8"
                 , Epel9 = "CentOS-Stream-9"
                 , Epel9Next = "CentOS-Stream-9"
@@ -255,9 +255,9 @@ let getTestingFarmJobVars =
         let distro =
               merge
                 { Rawhide = "fedora-rawhide"
-                , F37 = "fedora-37"
                 , F38 = "fedora-38"
                 , F39 = "fedora-39"
+                , F40 = "fedora-40"
                 , 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 3b96c51..b0d78e9 100644
--- a/FZCI.dhall/fedora-zuul-jobs/jobs.dhall
+++ b/FZCI.dhall/fedora-zuul-jobs/jobs.dhall
@@ -35,9 +35,9 @@ let createRpmInstallTestJob
               λ(branch : Branches.Type) →
                 merge
                   { 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
+                  , F40 = Nodesets.getName Nodesets.Type.Fedora-40-VM
                   , Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM
                   , Epel9 = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM
                   , Epel9Next =
@@ -74,9 +74,9 @@ let createRpmTestJob
                 merge
                   { Rawhide =
                       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
+                  , F40 = Nodesets.getName Nodesets.Type.Fedora-40-VM-Medium
                   , Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM
                   , Epel9 = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM
                   , Epel9Next =