From 38a99486efa4e315c1e0665150096926608df1bc Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Jan 05 2026 15:59:49 +0000 Subject: Add Fedora 43, add Fedora 42 containers, drop F40 and F41 F43 branched months ago and should be added. F40 went EOL months ago and should be removed, F41 went EOL last month. Fedora 42 and 43 containers now exist in SoftwareFactory so we can add them here. This also bumps all 'generic' jobs that used Fedora 41 containers (as 'Fedora-41-Container' or 'Fedora-Latest-Container') to use 43, as Fedora-Latest-Container. Signed-off-by: Adam Williamson --- diff --git a/FZCI.dhall/Branches.dhall b/FZCI.dhall/Branches.dhall index 26a5cca..93d679d 100644 --- a/FZCI.dhall/Branches.dhall +++ b/FZCI.dhall/Branches.dhall @@ -4,13 +4,12 @@ let Arches = ./Arches.dhall let --| When changing that union, update the `all` attribute too Union = - < Rawhide | F40 | F41 | F42 | Epel9 | Epel9Next > + < Rawhide | F42 | F43 | Epel9 | Epel9Next > let eq_def = { Rawhide = False - , F40 = False - , F41 = False , F42 = False + , F43 = False , Epel9 = False , Epel9Next = False } @@ -19,9 +18,8 @@ let show = λ(branch : Union) → merge { Rawhide = "rawhide" - , F40 = "f40" - , F41 = "f41" , F42 = "f42" + , F43 = "f43" , Epel9 = "epel9" , Epel9Next = "epel9-next" } @@ -29,16 +27,14 @@ let show = let all = [ Union.Rawhide + , Union.F43 , Union.F42 - , Union.F41 - , Union.F40 , Union.Epel9 , Union.Epel9Next ] let STIBranches = [ Union.F42 - , Union.F41 ] let isRawhide = λ(branch : Union) → merge (eq_def ⫽ { Rawhide = True }) branch @@ -63,9 +59,8 @@ in { Type = Union λ(branch : Union) → merge { Rawhide = "rawhide" - , F40 = "f40" - , F41 = "f41" , F42 = "f42" + , F43 = "f43" , Epel9 = "epel9" , Epel9Next = "epel9-next" } @@ -74,9 +69,8 @@ in { Type = Union λ(branch : Union) → merge { Rawhide = Arches.fedora - , F40 = Arches.fedora - , F41 = Arches.fedora , F42 = Arches.fedora + , F43 = Arches.fedora , Epel9 = Arches.epel9 , Epel9Next = Arches.epel9Next } @@ -86,12 +80,10 @@ in { Type = Union merge { Rawhide = "https://kojipkgs.fedoraproject.org/repos/rawhide/latest/x86_64/" + , F43 = + "https://kojipkgs.fedoraproject.org/repos/f43-build/latest/x86_64/" , F42 = "https://kojipkgs.fedoraproject.org/repos/f42-build/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/" , Epel9 = "https://kojipkgs.fedoraproject.org/repos/epel9-build/latest/x86_64/" , Epel9Next = diff --git a/FZCI.dhall/Nodesets.dhall b/FZCI.dhall/Nodesets.dhall index fe8cc55..a76cb56 100644 --- a/FZCI.dhall/Nodesets.dhall +++ b/FZCI.dhall/Nodesets.dhall @@ -1,39 +1,35 @@ let Zuul = (./Imports.dhall).Zuul -let latest-version = "41" +let latest-version = "43" let Nodeset = let Union = < Fedora-Latest-Container - | Fedora-40-Container - | Fedora-41-Container + | Fedora-43-Container + | Fedora-42-Container | Fedora-Rawhide-VM | Fedora-Latest-VM + | Fedora-43-VM | Fedora-42-VM - | Fedora-41-VM - | Fedora-40-VM | Fedora-Rawhide-VM-Medium | Fedora-Latest-VM-Medium + | Fedora-43-VM-Medium | Fedora-42-VM-Medium - | Fedora-41-VM-Medium - | Fedora-40-VM-Medium | Centos-Stream-9-VM > let all = [ Union.Fedora-Latest-Container - , Union.Fedora-40-Container - , Union.Fedora-41-Container + , Union.Fedora-43-Container + , Union.Fedora-42-Container , Union.Fedora-Rawhide-VM , Union.Fedora-Latest-VM + , Union.Fedora-43-VM , Union.Fedora-42-VM - , Union.Fedora-41-VM - , Union.Fedora-40-VM , Union.Fedora-Rawhide-VM-Medium , Union.Fedora-Latest-VM-Medium + , Union.Fedora-43-VM-Medium , Union.Fedora-42-VM-Medium - , Union.Fedora-41-VM-Medium - , Union.Fedora-40-VM-Medium , Union.Centos-Stream-9-VM ] @@ -56,10 +52,10 @@ let Nodeset = "fedora-latest-container" "zuul-worker-f${latest-version}" "container" - , Fedora-40-Container = - create "fedora-40-container" "zuul-worker-f40" "container" - , Fedora-41-Container = - create "fedora-41-container" "zuul-worker-f41" "container" + , Fedora-43-Container = + create "fedora-43-container" "zuul-worker-f43" "container" + , Fedora-42-Container = + create "fedora-42-container" "zuul-worker-f42" "container" , Fedora-Rawhide-VM = create "fedora-rawhide-vm" @@ -70,12 +66,10 @@ let Nodeset = "fedora-latest-vm" "cloud-fedora-${latest-version}-small" "cloud-host" + , Fedora-43-VM = + create "fedora-43-vm" "cloud-fedora-43-small" "cloud-host" , Fedora-42-VM = create "fedora-42-vm" "cloud-fedora-42-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-Rawhide-VM-Medium = create "fedora-rawhide-vm-medium" @@ -86,21 +80,16 @@ let Nodeset = "fedora-latest-vm-medium" "cloud-fedora-${latest-version}-medium" "cloud-host" + , Fedora-43-VM-Medium = + create + "fedora-43-vm-medium" + "cloud-fedora-43-medium" + "cloud-host" , Fedora-42-VM-Medium = create "fedora-42-vm-medium" "cloud-fedora-42-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" - "cloud-fedora-40-medium" - "cloud-host" , Centos-Stream-9-VM = create "centos-stream-9-vm" diff --git a/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall b/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall index 7f8ff00..a34ba05 100644 --- a/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall +++ b/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall @@ -61,7 +61,7 @@ let Arch = let executor_nodeset = Zuul.Nodeset.Inline Zuul.Nodeset.empty -let default_nodeset = Nodesets.getName Nodesets.Type.Fedora-41-Container +let default_nodeset = Nodesets.getName Nodesets.Type.Fedora-Latest-Container let check_for_sti_tests = Zuul.Job::{ @@ -229,9 +229,8 @@ let getTestingFarmJobVars = let name = merge { Rawhide = "Fedora-Rawhide" - , F40 = "Fedora-40" - , F41 = "Fedora-41" , F42 = "Fedora-42" + , F43 = "Fedora-43" , Epel9 = "CentOS-Stream-9" , Epel9Next = "CentOS-Stream-9" } @@ -240,9 +239,8 @@ let getTestingFarmJobVars = let distro = merge { Rawhide = "fedora-rawhide" - , F40 = "fedora-40" - , F41 = "fedora-41" , F42 = "fedora-42" + , F43 = "fedora-43" , 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 ef8ed2c..0275e2d 100644 --- a/FZCI.dhall/fedora-zuul-jobs/jobs.dhall +++ b/FZCI.dhall/fedora-zuul-jobs/jobs.dhall @@ -35,9 +35,8 @@ let createRpmInstallTestJob λ(branch : Branches.Type) → merge { Rawhide = Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM - , F40 = Nodesets.getName Nodesets.Type.Fedora-40-VM - , F41 = Nodesets.getName Nodesets.Type.Fedora-41-VM , F42 = Nodesets.getName Nodesets.Type.Fedora-42-VM + , F43 = Nodesets.getName Nodesets.Type.Fedora-43-VM , Epel9 = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM , Epel9Next = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM @@ -73,9 +72,8 @@ let createRpmTestJob merge { Rawhide = Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM-Medium - , F40 = Nodesets.getName Nodesets.Type.Fedora-40-VM-Medium - , F41 = Nodesets.getName Nodesets.Type.Fedora-41-VM-Medium , F42 = Nodesets.getName Nodesets.Type.Fedora-42-VM-Medium + , F43 = Nodesets.getName Nodesets.Type.Fedora-43-VM-Medium , Epel9 = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM , Epel9Next = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM @@ -118,7 +116,7 @@ let createRpmInspectJob , requires = Some [ "repo" ] , branches = Branches.zuulBranch branch , nodeset = Some - (Nodesets.getName Nodesets.Type.Fedora-41-Container) + (Nodesets.getName Nodesets.Type.Fedora-Latest-Container) , vars = Some ( Zuul.Vars.object [ { mapKey = "rpminspect_cmd"