From ae5e298c3755451164141d35520d6fd0ec448af1 Mon Sep 17 00:00:00 2001 From: Zuul CI Bot (Fabien Boucher) Date: Jun 06 2023 07:23:00 +0000 Subject: Merge #275 `Onboard epel9-next branch` --- diff --git a/FZCI.dhall/Arches.dhall b/FZCI.dhall/Arches.dhall index 75e7129..f2d50a2 100644 --- a/FZCI.dhall/Arches.dhall +++ b/FZCI.dhall/Arches.dhall @@ -14,6 +14,7 @@ in { Type = Union [ Union.X86_64, Union.S390X, Union.PPC64LE, Union.I686, Union.AARCH64 ] , epel8 = [ Union.X86_64, Union.PPC64LE, Union.AARCH64 ] , epel9 = [ Union.X86_64, Union.PPC64LE, Union.AARCH64 ] + , epel9Next = [ Union.X86_64, Union.PPC64LE, Union.AARCH64 ] , show = λ(arch : Union) → merge diff --git a/FZCI.dhall/Branches.dhall b/FZCI.dhall/Branches.dhall index 81fcd87..b9d898e 100644 --- a/FZCI.dhall/Branches.dhall +++ b/FZCI.dhall/Branches.dhall @@ -4,7 +4,7 @@ let Arches = ./Arches.dhall let --| When changing that union, update the `all` attribute too Union = - < Rawhide | F37 | F38 | Epel8 | Epel9 > + < Rawhide | F37 | F38 | Epel8 | Epel9 | Epel9Next > let eq_def = { Rawhide = False @@ -12,6 +12,7 @@ let eq_def = , F38 = False , Epel8 = False , Epel9 = False + , Epel9Next = False } let show = @@ -22,10 +23,18 @@ let show = , F38 = "f38" , Epel8 = "epel8" , Epel9 = "epel9" + , Epel9Next = "epel9-next" } branch -let all = [ Union.Rawhide, Union.F38, Union.F37, Union.Epel8, Union.Epel9 ] +let all = + [ Union.Rawhide + , Union.F38 + , Union.F37 + , Union.Epel8 + , Union.Epel9 + , Union.Epel9Next + ] let isRawhide = λ(branch : Union) → merge (eq_def ⫽ { Rawhide = True }) branch @@ -51,6 +60,7 @@ in { Type = Union , F38 = "f38" , Epel8 = "epel8" , Epel9 = "epel9" + , Epel9Next = "epel9-next" } branch , arches = @@ -61,6 +71,7 @@ in { Type = Union , F38 = Arches.fedora , Epel8 = Arches.epel8 , Epel9 = Arches.epel9 + , Epel9Next = Arches.epel9Next } branch , kojirepos = @@ -76,6 +87,8 @@ in { Type = Union "https://kojipkgs.fedoraproject.org/repos/epel8-build/latest/x86_64/" , Epel9 = "https://kojipkgs.fedoraproject.org/repos/epel9-build/latest/x86_64/" + , Epel9Next = + "https://kojipkgs.fedoraproject.org/repos/epel9-next-build/latest/x86_64/" } branch , isRawhide diff --git a/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall b/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall index 43716ff..76d5a41 100644 --- a/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall +++ b/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall @@ -218,6 +218,7 @@ let getTestingFarmJobVars = , F38 = "Fedora-38" , Epel8 = "CentOS-Stream-8" , Epel9 = "CentOS-Stream-9" + , Epel9Next = "CentOS-Stream-9" } branch @@ -228,6 +229,7 @@ let getTestingFarmJobVars = , F38 = "fedora-38" , Epel8 = "centos-stream-8" , Epel9 = "centos-stream-9" + , Epel9Next = "centos-stream-9" } branch diff --git a/FZCI.dhall/fedora-zuul-jobs/jobs.dhall b/FZCI.dhall/fedora-zuul-jobs/jobs.dhall index f284224..31dd1c8 100644 --- a/FZCI.dhall/fedora-zuul-jobs/jobs.dhall +++ b/FZCI.dhall/fedora-zuul-jobs/jobs.dhall @@ -39,6 +39,8 @@ let createRpmInstallTestJob , F38 = Nodesets.getName Nodesets.Type.Fedora-38-VM , Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM , Epel9 = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM + , Epel9Next = + Nodesets.getName Nodesets.Type.Centos-Stream-9-VM } branch @@ -79,6 +81,8 @@ let createRpmTestJob , F38 = Nodesets.getName Nodesets.Type.Fedora-38-VM-Medium , Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM , Epel9 = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM + , Epel9Next = + Nodesets.getName Nodesets.Type.Centos-Stream-9-VM } branch