From beff3e672c10ce94f66aee24f40c1ca6679a05c4 Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Feb 06 2025 09:42:24 +0000 Subject: Add Fedora 42; drop Fedora 39 What added: - nodesets - branches --- diff --git a/FZCI.dhall/Branches.dhall b/FZCI.dhall/Branches.dhall index 0e1de3a..6f288d8 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 | F39 | F40 | F41 | Epel9 | Epel9Next > + < Rawhide | F40 | F41 | F42 | Epel9 | Epel9Next > let eq_def = { Rawhide = False - , F39 = False , F40 = False , F41 = False + , F42 = False , Epel9 = False , Epel9Next = False } @@ -19,9 +19,9 @@ let show = λ(branch : Union) → merge { Rawhide = "rawhide" - , F39 = "f39" , F40 = "f40" , F41 = "f41" + , F42 = "f42" , Epel9 = "epel9" , Epel9Next = "epel9-next" } @@ -29,9 +29,9 @@ let show = let all = [ Union.Rawhide - , Union.F40 + , Union.F42 , Union.F41 - , Union.F39 + , Union.F40 , Union.Epel9 , Union.Epel9Next ] @@ -56,9 +56,9 @@ in { Type = Union λ(branch : Union) → merge { Rawhide = "rawhide" - , F39 = "f39" , F40 = "f40" , F41 = "f41" + , F42 = "f42" , Epel9 = "epel9" , Epel9Next = "epel9-next" } @@ -67,9 +67,9 @@ in { Type = Union λ(branch : Union) → merge { Rawhide = Arches.fedora - , F39 = Arches.fedora , F40 = Arches.fedora , F41 = Arches.fedora + , F42 = Arches.fedora , Epel9 = Arches.epel9 , Epel9Next = Arches.epel9Next } @@ -79,12 +79,12 @@ in { Type = Union merge { Rawhide = "https://kojipkgs.fedoraproject.org/repos/rawhide/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/" - , F39 = - "https://kojipkgs.fedoraproject.org/repos/f39-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 8069a4a..fbb1bcb 100644 --- a/FZCI.dhall/Nodesets.dhall +++ b/FZCI.dhall/Nodesets.dhall @@ -1,39 +1,37 @@ let Zuul = (./Imports.dhall).Zuul -let latest-version = "40" +let latest-version = "41" let Nodeset = let Union = < Fedora-Latest-Container | Fedora-40-Container - | Fedora-39-Container | Fedora-Rawhide-VM | Fedora-Latest-VM + | Fedora-42-VM | Fedora-41-VM | Fedora-40-VM - | Fedora-39-VM | Fedora-Rawhide-VM-Medium | Fedora-Latest-VM-Medium + | Fedora-42-VM-Medium | Fedora-41-VM-Medium | Fedora-40-VM-Medium - | Fedora-39-VM-Medium | Centos-Stream-9-VM > let all = [ Union.Fedora-Latest-Container , Union.Fedora-40-Container - , Union.Fedora-39-Container , Union.Fedora-Rawhide-VM , Union.Fedora-Latest-VM + , Union.Fedora-42-VM , Union.Fedora-41-VM , Union.Fedora-40-VM - , Union.Fedora-39-VM , Union.Fedora-Rawhide-VM-Medium , Union.Fedora-Latest-VM-Medium + , Union.Fedora-42-VM-Medium , Union.Fedora-41-VM-Medium , Union.Fedora-40-VM-Medium - , Union.Fedora-39-VM-Medium , Union.Centos-Stream-9-VM ] @@ -58,8 +56,6 @@ let Nodeset = "container" , Fedora-40-Container = create "fedora-40-container" "zuul-worker-f40" "container" - , Fedora-39-Container = - create "fedora-39-container" "zuul-worker-f39" "container" , Fedora-Rawhide-VM = create "fedora-rawhide-vm" @@ -70,12 +66,12 @@ let Nodeset = "fedora-latest-vm" "cloud-fedora-${latest-version}-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-39-VM = - create "fedora-39-vm" "cloud-fedora-39-small" "cloud-host" , Fedora-Rawhide-VM-Medium = create "fedora-rawhide-vm-medium" @@ -86,6 +82,11 @@ let Nodeset = "fedora-latest-vm-medium" "cloud-fedora-${latest-version}-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" @@ -96,11 +97,6 @@ let Nodeset = "fedora-40-vm-medium" "cloud-fedora-40-medium" "cloud-host" - , Fedora-39-VM-Medium = - create - "fedora-39-vm-medium" - "cloud-fedora-39-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 089fa93..bada14d 100644 --- a/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall +++ b/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall @@ -105,7 +105,7 @@ let clean_stalled_koji_tasks = , name = "${job-prefix}clean-stalled-koji-tasks" , protected = Some True , description = Some "Cancel Koji tasks running for more than 12 hours" - , nodeset = Some (Nodesets.getName Nodesets.Type.Fedora-39-Container) + , nodeset = Some (Nodesets.getName Nodesets.Type.Fedora-40-Container) , roles = Some [ { zuul = "zuul-distro-jobs" } ] , run = Some "playbooks/koji/clean-stalled-koji-tasks.yaml" , secrets = Some @@ -229,9 +229,9 @@ let getTestingFarmJobVars = let name = merge { Rawhide = "Fedora-Rawhide" - , F39 = "Fedora-39" , F40 = "Fedora-40" , F41 = "Fedora-41" + , F42 = "Fedora-42" , Epel9 = "CentOS-Stream-9" , Epel9Next = "CentOS-Stream-9" } @@ -240,9 +240,9 @@ let getTestingFarmJobVars = let distro = merge { Rawhide = "fedora-rawhide" - , F39 = "fedora-39" , F40 = "fedora-40" , F41 = "fedora-41" + , F42 = "fedora-42" , 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 5d0e1cf..b66c1fd 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 - , F39 = Nodesets.getName Nodesets.Type.Fedora-39-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 , Epel9 = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM , Epel9Next = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM @@ -73,9 +73,9 @@ let createRpmTestJob merge { Rawhide = Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM-Medium - , F39 = Nodesets.getName Nodesets.Type.Fedora-39-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 , Epel9 = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM , Epel9Next = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM