From e6a98cf18bcf966c2e4a2d0f2fbbf85615fef458 Mon Sep 17 00:00:00 2001
From: Miroslav Vadkerti <mvadkert@redhat.com>
Date: Apr 12 2022 15:00:52 +0000
Subject: Add support for Epel9


@fbo few comments from me:

* I kept the playbook the same as with epel8
* nodepool config will need review

Resolves https://pagure.io/fedora-ci/general/issue/303

Signed-off-by: Miroslav Vadkerti <mvadkert@redhat.com>

---

diff --git a/FZCI.dhall/Arches.dhall b/FZCI.dhall/Arches.dhall
index babbef8..51fb077 100644
--- a/FZCI.dhall/Arches.dhall
+++ b/FZCI.dhall/Arches.dhall
@@ -20,6 +20,7 @@ in  { Type = Union
       , Union.AARCH64
       ]
     , epel8 = [ Union.X86_64, Union.PPC64LE, Union.AARCH64 ]
+    , epel9 = [ Union.X86_64, Union.PPC64LE, Union.AARCH64 ]
     , show =
         λ(arch : Union) →
           merge
diff --git a/FZCI.dhall/Branches.dhall b/FZCI.dhall/Branches.dhall
index 0344dc2..31138a8 100644
--- a/FZCI.dhall/Branches.dhall
+++ b/FZCI.dhall/Branches.dhall
@@ -4,10 +4,16 @@ let Arches = ./Arches.dhall
 
 let --| When changing that union, update the `all` attribute too
     Union =
-      < Rawhide | F34 | F35 | F36 | Epel8 >
+      < Rawhide | F34 | F35 | F36 | Epel8 | Epel9 >
 
 let eq_def =
-      { Rawhide = False, F34 = False, F35 = False, F36 = False, Epel8 = False }
+      { Rawhide = False
+      , F34 = False
+      , F35 = False
+      , F36 = False
+      , Epel8 = False
+      , Epel9 = False
+      }
 
 let show =
       λ(branch : Union) →
@@ -17,10 +23,11 @@ let show =
           , F35 = "f35"
           , F36 = "f36"
           , Epel8 = "epel8"
+          , Epel9 = "epel9"
           }
           branch
 
-let all = [ Union.Rawhide, Union.F36, Union.F35, Union.F34, Union.Epel8 ]
+let all = [ Union.Rawhide, Union.F36, Union.F35, Union.F34, Union.Epel8, Union.Epel9 ]
 
 let isRawhide = λ(branch : Union) → merge (eq_def ⫽ { Rawhide = True }) branch
 
@@ -46,6 +53,7 @@ in  { Type = Union
             , F35 = "f35"
             , F36 = "f36"
             , Epel8 = "epel8"
+            , Epel9 = "epel9"
             }
             branch
     , arches =
@@ -62,6 +70,7 @@ in  { Type = Union
             , F35 = Arches.fedora
             , F36 = Arches.fedora
             , Epel8 = Arches.epel8
+            , Epel9 = Arches.epel9
             }
             branch
     , kojirepos =
@@ -77,8 +86,11 @@ in  { Type = Union
                 "https://kojipkgs.fedoraproject.org/repos/f36-build/latest/x86_64/"
             , Epel8 =
                 "https://kojipkgs.fedoraproject.org/repos/epel8-build/latest/x86_64/"
+            , Epel9 =
+                "https://kojipkgs.fedoraproject.org/repos/epel9-build/latest/x86_64/"
             }
             branch
     , isRawhide
     , isEpel8 = λ(branch : Union) → merge (eq_def ⫽ { Epel8 = True }) branch
+    , isEpel9 = λ(branch : Union) → merge (eq_def ⫽ { Epel9 = True }) branch
     }
diff --git a/FZCI.dhall/Nodesets.dhall b/FZCI.dhall/Nodesets.dhall
index 3caecc5..8387e82 100644
--- a/FZCI.dhall/Nodesets.dhall
+++ b/FZCI.dhall/Nodesets.dhall
@@ -32,6 +32,7 @@ let Nodeset =
             | Fedora-31-VM-Medium
             | Fedora-30-VM-Medium
             | Centos-8-VM
+            | Centos-Stream-9-VM
             >
 
       let all =
@@ -63,6 +64,7 @@ let Nodeset =
             , Union.Fedora-31-VM-Medium
             , Union.Fedora-30-VM-Medium
             , Union.Centos-8-VM
+            , Union.Centos-Stream-9-VM
             ]
 
       let create
@@ -171,6 +173,8 @@ let Nodeset =
                       "cloud-host"
                 , Centos-8-VM =
                     create "centos-8-vm" "cloud-centos-8" "cloud-host"
+                , Centos-Stream-9-VM =
+                    create "centos-stream-9-vm" "cloud-centos-9-stream" "cloud-host"
                 }
                 nodeset
 
diff --git a/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall b/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall
index e995b34..74e8cb0 100644
--- a/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall
+++ b/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall
@@ -227,6 +227,7 @@ let getTestingFarmJobVars =
                 , F35 = "Fedora-35"
                 , F36 = "Fedora-36"
                 , Epel8 = "CentOS-Stream-8"
+                , Epel9 = "CentOS-Stream-9"
                 }
                 branch
 
@@ -237,6 +238,7 @@ let getTestingFarmJobVars =
                 , F35 = "fedora-35"
                 , F36 = "fedora-36"
                 , Epel8 = "centos-stream-8"
+                , Epel9 = "centos-stream-9"
                 }
                 branch
 
diff --git a/FZCI.dhall/fedora-zuul-jobs/jobs.dhall b/FZCI.dhall/fedora-zuul-jobs/jobs.dhall
index b2b8672..e647b73 100644
--- a/FZCI.dhall/fedora-zuul-jobs/jobs.dhall
+++ b/FZCI.dhall/fedora-zuul-jobs/jobs.dhall
@@ -39,6 +39,7 @@ let createRpmInstallTestJob
                   , F35 = Nodesets.getName Nodesets.Type.Fedora-35-VM-Medium
                   , F36 = Nodesets.getName Nodesets.Type.Fedora-36-VM
                   , Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM
+                  , Epel9 = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM
                   }
                   branch
 
@@ -60,6 +61,11 @@ let createRpmInstallTestJob
               then  job ⫽ { pre-run = Some [ "playbooks/epel8/install.yaml" ] }
               else  job
 
+        let job =
+              if    Branches.isEpel9 branch
+              then  job ⫽ { pre-run = Some [ "playbooks/epel8/install.yaml" ] }
+              else  job
+
         in  job
 
 let createRpmTestJob
@@ -74,6 +80,7 @@ let createRpmTestJob
                   , F35 = Nodesets.getName Nodesets.Type.Fedora-35-VM-Medium
                   , F36 = Nodesets.getName Nodesets.Type.Fedora-36-VM-Medium
                   , Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM
+                  , Epel9 = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM
                   }
                   branch
 
@@ -98,6 +105,11 @@ let createRpmTestJob
               then  job ⫽ { pre-run = Some [ "playbooks/epel8/install.yaml" ] }
               else  job
 
+        let job =
+              if    Branches.isEpel9 branch
+              then  job ⫽ { pre-run = Some [ "playbooks/epel8/install.yaml" ] }
+              else  job
+
         in  job
 
 let createRpmInspectJob