From 070ffb5da49c6d8a5969172e386d9efdb5fb3346 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Sep 04 2024 09:46:52 +0000
Subject: Support of f41 branch


Require: https://softwarefactory-project.io/r/c/config/+/32206

---

diff --git a/FZCI.dhall/Branches.dhall b/FZCI.dhall/Branches.dhall
index c1552ec..0e1de3a 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 | F39 | F40 | Epel9 | Epel9Next >
+      < Rawhide | F39 | F40 | F41 | Epel9 | Epel9Next >
 
 let eq_def =
       { Rawhide = False
       , F39 = False
       , F40 = False
+      , F41 = False
       , Epel9 = False
       , Epel9Next = False
       }
@@ -20,12 +21,20 @@ let show =
           { Rawhide = "rawhide"
           , F39 = "f39"
           , F40 = "f40"
+          , F41 = "f41"
           , Epel9 = "epel9"
           , Epel9Next = "epel9-next"
           }
           branch
 
-let all = [ Union.Rawhide, Union.F40, Union.F39, Union.Epel9, Union.Epel9Next ]
+let all =
+      [ Union.Rawhide
+      , Union.F40
+      , Union.F41
+      , Union.F39
+      , Union.Epel9
+      , Union.Epel9Next
+      ]
 
 let isRawhide = λ(branch : Union) → merge (eq_def ⫽ { Rawhide = True }) branch
 
@@ -49,6 +58,7 @@ in  { Type = Union
             { Rawhide = "rawhide"
             , F39 = "f39"
             , F40 = "f40"
+            , F41 = "f41"
             , Epel9 = "epel9"
             , Epel9Next = "epel9-next"
             }
@@ -59,6 +69,7 @@ in  { Type = Union
             { Rawhide = Arches.fedora
             , F39 = Arches.fedora
             , F40 = Arches.fedora
+            , F41 = Arches.fedora
             , Epel9 = Arches.epel9
             , Epel9Next = Arches.epel9Next
             }
@@ -68,6 +79,8 @@ in  { Type = Union
           merge
             { Rawhide =
                 "https://kojipkgs.fedoraproject.org/repos/rawhide/latest/x86_64/"
+            , F41 =
+                "https://kojipkgs.fedoraproject.org/repos/f41-build/latest/x86_64/"
             , F40 =
                 "https://kojipkgs.fedoraproject.org/repos/f40-build/latest/x86_64/"
             , F39 =
diff --git a/FZCI.dhall/Nodesets.dhall b/FZCI.dhall/Nodesets.dhall
index 8a9405f..8069a4a 100644
--- a/FZCI.dhall/Nodesets.dhall
+++ b/FZCI.dhall/Nodesets.dhall
@@ -9,10 +9,12 @@ let Nodeset =
             | Fedora-39-Container
             | Fedora-Rawhide-VM
             | Fedora-Latest-VM
+            | Fedora-41-VM
             | Fedora-40-VM
             | Fedora-39-VM
             | Fedora-Rawhide-VM-Medium
             | Fedora-Latest-VM-Medium
+            | Fedora-41-VM-Medium
             | Fedora-40-VM-Medium
             | Fedora-39-VM-Medium
             | Centos-Stream-9-VM
@@ -24,10 +26,12 @@ let Nodeset =
             , Union.Fedora-39-Container
             , Union.Fedora-Rawhide-VM
             , Union.Fedora-Latest-VM
+            , Union.Fedora-41-VM
             , Union.Fedora-40-VM
             , Union.Fedora-39-VM
             , Union.Fedora-Rawhide-VM-Medium
             , Union.Fedora-Latest-VM-Medium
+            , Union.Fedora-41-VM-Medium
             , Union.Fedora-40-VM-Medium
             , Union.Fedora-39-VM-Medium
             , Union.Centos-Stream-9-VM
@@ -66,6 +70,8 @@ let Nodeset =
                       "fedora-latest-vm"
                       "cloud-fedora-${latest-version}-small"
                       "cloud-host"
+                , Fedora-41-VM =
+                    create "fedora-41-vm" "cloud-fedora-41-small" "cloud-host"
                 , Fedora-40-VM =
                     create "fedora-40-vm" "cloud-fedora-40-small" "cloud-host"
                 , Fedora-39-VM =
@@ -80,6 +86,11 @@ let Nodeset =
                       "fedora-latest-vm-medium"
                       "cloud-fedora-${latest-version}-medium"
                       "cloud-host"
+                , Fedora-41-VM-Medium =
+                    create
+                      "fedora-41-vm-medium"
+                      "cloud-fedora-41-medium"
+                      "cloud-host"
                 , Fedora-40-VM-Medium =
                     create
                       "fedora-40-vm-medium"
diff --git a/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall b/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall
index c80ce1c..cd6a042 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"
                 , F39 = "Fedora-39"
                 , F40 = "Fedora-40"
+                , F41 = "Fedora-41"
                 , Epel9 = "CentOS-Stream-9"
                 , Epel9Next = "CentOS-Stream-9"
                 }
@@ -255,6 +256,7 @@ let getTestingFarmJobVars =
                 { Rawhide = "fedora-rawhide"
                 , F39 = "fedora-39"
                 , F40 = "fedora-40"
+                , F41 = "fedora-41"
                 , 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 5048609..5d0e1cf 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
                   , F39 = Nodesets.getName Nodesets.Type.Fedora-39-VM
                   , F40 = Nodesets.getName Nodesets.Type.Fedora-40-VM
+                  , F41 = Nodesets.getName Nodesets.Type.Fedora-41-VM
                   , Epel9 = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM
                   , Epel9Next =
                       Nodesets.getName Nodesets.Type.Centos-Stream-9-VM
@@ -74,6 +75,7 @@ let createRpmTestJob
                       Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM-Medium
                   , F39 = Nodesets.getName Nodesets.Type.Fedora-39-VM-Medium
                   , F40 = Nodesets.getName Nodesets.Type.Fedora-40-VM-Medium
+                  , F41 = Nodesets.getName Nodesets.Type.Fedora-41-VM-Medium
                   , Epel9 = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM
                   , Epel9Next =
                       Nodesets.getName Nodesets.Type.Centos-Stream-9-VM