From 8dc1f2c5e94a151c6b44c6856f92ad88cb52faf0 Mon Sep 17 00:00:00 2001 From: Miroslav Vadkerti Date: Sep 05 2022 08:36:46 +0000 Subject: Onboard to Fedora 37, drop Fedora 34 Fedora 37 has branched, add it. Fedora 34 is EOL now. Signed-off-by: Miroslav Vadkerti --- diff --git a/FZCI.dhall/Branches.dhall b/FZCI.dhall/Branches.dhall index 31138a8..bcbee01 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 | F34 | F35 | F36 | Epel8 | Epel9 > + < Rawhide | F35 | F36 | F37 | Epel8 | Epel9 > let eq_def = { Rawhide = False - , F34 = False , F35 = False , F36 = False + , F37 = False , Epel8 = False , Epel9 = False } @@ -19,15 +19,15 @@ let show = λ(branch : Union) → merge { Rawhide = "rawhide" - , F34 = "f34" , F35 = "f35" , F36 = "f36" + , F37 = "f37" , Epel8 = "epel8" , Epel9 = "epel9" } branch -let all = [ Union.Rawhide, Union.F36, Union.F35, Union.F34, Union.Epel8, Union.Epel9 ] +let all = [ Union.Rawhide, Union.F37, Union.F36, Union.F35, Union.Epel8, Union.Epel9 ] let isRawhide = λ(branch : Union) → merge (eq_def ⫽ { Rawhide = True }) branch @@ -49,9 +49,9 @@ in { Type = Union λ(branch : Union) → merge { Rawhide = "rawhide" - , F34 = "f34" , F35 = "f35" , F36 = "f36" + , F37 = "f37" , Epel8 = "epel8" , Epel9 = "epel9" } @@ -66,9 +66,9 @@ in { Type = Union Prelude.Bool.not (Arches.isARMV7HL arch) ) Arches.fedora - , F34 = Arches.fedora , F35 = Arches.fedora , F36 = Arches.fedora + , F37 = Arches.fedora , Epel8 = Arches.epel8 , Epel9 = Arches.epel9 } @@ -78,12 +78,12 @@ in { Type = Union merge { Rawhide = "https://kojipkgs.fedoraproject.org/repos/rawhide/latest/x86_64/" - , F34 = - "https://kojipkgs.fedoraproject.org/repos/f34-build/latest/x86_64/" , F35 = "https://kojipkgs.fedoraproject.org/repos/f35-build/latest/x86_64/" , F36 = "https://kojipkgs.fedoraproject.org/repos/f36-build/latest/x86_64/" + , F37 = + "https://kojipkgs.fedoraproject.org/repos/f37-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 e09e311..9a35a25 100644 --- a/FZCI.dhall/Nodesets.dhall +++ b/FZCI.dhall/Nodesets.dhall @@ -5,6 +5,7 @@ let latest-version = "36" let Nodeset = let Union = < Fedora-Latest-Container + | Fedora-37-Container | Fedora-36-Container | Fedora-35-Container | Fedora-34-Container @@ -16,6 +17,7 @@ let Nodeset = | Centos-7-Container | Fedora-Rawhide-VM | Fedora-Latest-VM + | Fedora-37-VM | Fedora-36-VM | Fedora-35-VM | Fedora-34-VM @@ -25,6 +27,7 @@ let Nodeset = | Fedora-30-VM | Fedora-Rawhide-VM-Medium | Fedora-Latest-VM-Medium + | Fedora-37-VM-Medium | Fedora-36-VM-Medium | Fedora-35-VM-Medium | Fedora-34-VM-Medium @@ -38,6 +41,7 @@ let Nodeset = let all = [ Union.Fedora-Latest-Container + , Union.Fedora-37-Container , Union.Fedora-36-Container , Union.Fedora-35-Container , Union.Fedora-34-Container @@ -49,6 +53,7 @@ let Nodeset = , Union.Centos-7-Container , Union.Fedora-Rawhide-VM , Union.Fedora-Latest-VM + , Union.Fedora-37-VM , Union.Fedora-36-VM , Union.Fedora-35-VM , Union.Fedora-34-VM @@ -58,6 +63,7 @@ let Nodeset = , Union.Fedora-30-VM , Union.Fedora-Rawhide-VM-Medium , Union.Fedora-Latest-VM-Medium + , Union.Fedora-37-VM-Medium , Union.Fedora-36-VM-Medium , Union.Fedora-35-VM-Medium , Union.Fedora-34-VM-Medium @@ -88,6 +94,8 @@ let Nodeset = "fedora-latest-container" "zuul-worker-f${latest-version}" "container" + , Fedora-37-Container = + create "fedora-37-container" "zuul-worker-f37" "container" , Fedora-36-Container = create "fedora-36-container" "zuul-worker-f36" "container" , Fedora-35-Container = @@ -116,6 +124,8 @@ let Nodeset = "fedora-latest-vm" "cloud-fedora-${latest-version}-small" "cloud-host" + , Fedora-37-VM = + create "fedora-37-vm" "cloud-fedora-37-small" "cloud-host" , Fedora-36-VM = create "fedora-36-vm" "cloud-fedora-36-small" "cloud-host" , Fedora-35-VM = @@ -140,6 +150,11 @@ let Nodeset = "fedora-latest-vm-medium" "cloud-fedora-${latest-version}-medium" "cloud-host" + , Fedora-37-VM-Medium = + create + "fedora-37-vm-medium" + "cloud-fedora-37-medium" + "cloud-host" , Fedora-36-VM-Medium = create "fedora-36-vm-medium" diff --git a/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall b/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall index 7e5fab4..546a865 100644 --- a/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall +++ b/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall @@ -223,9 +223,9 @@ let getTestingFarmJobVars = let name = merge { Rawhide = "Fedora-Rawhide" - , F34 = "Fedora-34" , F35 = "Fedora-35" , F36 = "Fedora-36" + , F37 = "Fedora-37" , Epel8 = "CentOS-Stream-8" , Epel9 = "CentOS-Stream-9" } @@ -234,9 +234,9 @@ let getTestingFarmJobVars = let distro = merge { Rawhide = "fedora-rawhide" - , F34 = "fedora-34" , F35 = "fedora-35" , F36 = "fedora-36" + , F37 = "fedora-37" , 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 a425dc5..976b7f4 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 - , F34 = Nodesets.getName Nodesets.Type.Fedora-34-Container , F35 = Nodesets.getName Nodesets.Type.Fedora-35-VM-Medium , F36 = Nodesets.getName Nodesets.Type.Fedora-36-VM + , F37 = Nodesets.getName Nodesets.Type.Fedora-37-VM , Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM , Epel9 = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM } @@ -76,9 +76,9 @@ let createRpmTestJob merge { Rawhide = Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM-Medium - , F34 = Nodesets.getName Nodesets.Type.Fedora-34-VM-Medium , F35 = Nodesets.getName Nodesets.Type.Fedora-35-VM-Medium , F36 = Nodesets.getName Nodesets.Type.Fedora-36-VM-Medium + , F37 = Nodesets.getName Nodesets.Type.Fedora-37-VM-Medium , Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM , Epel9 = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM }