From adc646f5b8eaf5b87ad514bd1fed4ae66c3d7951 Mon Sep 17 00:00:00 2001 From: Miroslav Vadkerti Date: Mar 01 2023 08:20:41 +0000 Subject: Onboard Fedora 38 Signed-off-by: Miroslav Vadkerti --- diff --git a/FZCI.dhall/Branches.dhall b/FZCI.dhall/Branches.dhall index 1b89c00..1d3f8e6 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 | F36 | F37 | Epel8 | Epel9 > + < Rawhide | F36 | F37 | F38 | Epel8 | Epel9 > let eq_def = { Rawhide = False , F36 = False , F37 = False + , F38 = False , Epel8 = False , Epel9 = False } @@ -20,12 +21,20 @@ let show = { Rawhide = "rawhide" , F36 = "f36" , F37 = "f37" + , F38 = "f38" , Epel8 = "epel8" , Epel9 = "epel9" } branch -let all = [ Union.Rawhide, Union.F37, Union.F36, Union.Epel8, Union.Epel9 ] +let all = + [ Union.Rawhide + , Union.F38 + , Union.F37 + , Union.F36 + , Union.Epel8 + , Union.Epel9 + ] let isRawhide = λ(branch : Union) → merge (eq_def ⫽ { Rawhide = True }) branch @@ -49,6 +58,7 @@ in { Type = Union { Rawhide = "rawhide" , F36 = "f36" , F37 = "f37" + , F38 = "f38" , Epel8 = "epel8" , Epel9 = "epel9" } @@ -71,6 +81,13 @@ in { Type = Union Prelude.Bool.not (Arches.isARMV7HL arch) ) Arches.fedora + , F38 = + Prelude.List.filter + Arches.Type + ( λ(arch : Arches.Type) → + Prelude.Bool.not (Arches.isARMV7HL arch) + ) + Arches.fedora , Epel8 = Arches.epel8 , Epel9 = Arches.epel9 } @@ -84,6 +101,8 @@ in { Type = Union "https://kojipkgs.fedoraproject.org/repos/f36-build/latest/x86_64/" , F37 = "https://kojipkgs.fedoraproject.org/repos/f37-build/latest/x86_64/" + , F38 = + "https://kojipkgs.fedoraproject.org/repos/f38-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 48116a5..e4f41fc 100644 --- a/FZCI.dhall/Nodesets.dhall +++ b/FZCI.dhall/Nodesets.dhall @@ -5,16 +5,19 @@ let latest-version = "36" let Nodeset = let Union = < Fedora-Latest-Container + | Fedora-38-Container | Fedora-37-Container | Fedora-36-Container | Centos-8-Container | Centos-7-Container | Fedora-Rawhide-VM | Fedora-Latest-VM + | Fedora-38-VM | Fedora-37-VM | Fedora-36-VM | Fedora-Rawhide-VM-Medium | Fedora-Latest-VM-Medium + | Fedora-38-VM-Medium | Fedora-37-VM-Medium | Fedora-36-VM-Medium | Centos-8-VM @@ -23,16 +26,19 @@ let Nodeset = let all = [ Union.Fedora-Latest-Container + , Union.Fedora-38-Container , Union.Fedora-37-Container , Union.Fedora-36-Container , Union.Centos-8-Container , Union.Centos-7-Container , Union.Fedora-Rawhide-VM , Union.Fedora-Latest-VM + , Union.Fedora-38-VM , Union.Fedora-37-VM , Union.Fedora-36-VM , Union.Fedora-Rawhide-VM-Medium , Union.Fedora-Latest-VM-Medium + , Union.Fedora-38-VM-Medium , Union.Fedora-37-VM-Medium , Union.Fedora-36-VM-Medium , Union.Centos-8-VM @@ -58,6 +64,8 @@ let Nodeset = "fedora-latest-container" "zuul-worker-f${latest-version}" "container" + , Fedora-38-Container = + create "fedora-38-container" "zuul-worker-f37" "container" , Fedora-37-Container = create "fedora-37-container" "zuul-worker-f37" "container" , Fedora-36-Container = @@ -76,6 +84,8 @@ let Nodeset = "fedora-latest-vm" "cloud-fedora-${latest-version}-small" "cloud-host" + , Fedora-38-VM = + create "fedora-38-vm" "cloud-fedora-38-small" "cloud-host" , Fedora-37-VM = create "fedora-37-vm" "cloud-fedora-37-small" "cloud-host" , Fedora-36-VM = @@ -90,6 +100,11 @@ let Nodeset = "fedora-latest-vm-medium" "cloud-fedora-${latest-version}-medium" "cloud-host" + , Fedora-38-VM-Medium = + create + "fedora-38-vm-medium" + "cloud-fedora-38-medium" + "cloud-host" , Fedora-37-VM-Medium = create "fedora-37-vm-medium" diff --git a/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall b/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall index 3a46d61..3e5edcd 100644 --- a/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall +++ b/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall @@ -216,6 +216,7 @@ let getTestingFarmJobVars = { Rawhide = "Fedora-Rawhide" , F36 = "Fedora-36" , F37 = "Fedora-37" + , F38 = "Fedora-38" , Epel8 = "CentOS-Stream-8" , Epel9 = "CentOS-Stream-9" } @@ -226,6 +227,7 @@ let getTestingFarmJobVars = { Rawhide = "fedora-rawhide" , F36 = "fedora-36" , F37 = "fedora-37" + , F38 = "fedora-38" , Epel8 = "centos-stream-8" , Epel9 = "centos-stream-9" } diff --git a/FZCI.dhall/fedora-zuul-jobs/jobs.dhall b/FZCI.dhall/fedora-zuul-jobs/jobs.dhall index f62670f..28955fd 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 , F36 = Nodesets.getName Nodesets.Type.Fedora-36-VM , F37 = Nodesets.getName Nodesets.Type.Fedora-37-VM + , 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 } @@ -77,6 +78,7 @@ let createRpmTestJob Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM-Medium , F36 = Nodesets.getName Nodesets.Type.Fedora-36-VM-Medium , F37 = Nodesets.getName Nodesets.Type.Fedora-37-VM-Medium + , 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 }