From 424a47131e944025f8ee0f575f91a12d1647c234 Mon Sep 17 00:00:00 2001 From: Fabien Boucher Date: Jul 12 2024 11:30:01 +0000 Subject: Remove EOL nodes and branches version Also removel epel8 branch support as we no longer provide stream 8 container/vm. --- diff --git a/FZCI.dhall/Branches.dhall b/FZCI.dhall/Branches.dhall index 372c147..c1552ec 100644 --- a/FZCI.dhall/Branches.dhall +++ b/FZCI.dhall/Branches.dhall @@ -4,14 +4,12 @@ let Arches = ./Arches.dhall let --| When changing that union, update the `all` attribute too Union = - < Rawhide | F38 | F39 | F40 | Epel8 | Epel9 | Epel9Next > + < Rawhide | F39 | F40 | Epel9 | Epel9Next > let eq_def = { Rawhide = False - , F38 = False , F39 = False , F40 = False - , Epel8 = False , Epel9 = False , Epel9Next = False } @@ -20,24 +18,14 @@ let show = λ(branch : Union) → merge { Rawhide = "rawhide" - , F38 = "f38" , F39 = "f39" , F40 = "f40" - , Epel8 = "epel8" , Epel9 = "epel9" , Epel9Next = "epel9-next" } branch -let all = - [ Union.Rawhide - , Union.F40 - , Union.F39 - , Union.F38 - , Union.Epel8 - , Union.Epel9 - , Union.Epel9Next - ] +let all = [ Union.Rawhide, Union.F40, Union.F39, Union.Epel9, Union.Epel9Next ] let isRawhide = λ(branch : Union) → merge (eq_def ⫽ { Rawhide = True }) branch @@ -59,10 +47,8 @@ in { Type = Union λ(branch : Union) → merge { Rawhide = "rawhide" - , F38 = "f38" , F39 = "f39" , F40 = "f40" - , Epel8 = "epel8" , Epel9 = "epel9" , Epel9Next = "epel9-next" } @@ -71,10 +57,8 @@ in { Type = Union λ(branch : Union) → merge { Rawhide = Arches.fedora - , F38 = Arches.fedora , F39 = Arches.fedora , F40 = Arches.fedora - , Epel8 = Arches.epel8 , Epel9 = Arches.epel9 , Epel9Next = Arches.epel9Next } @@ -86,12 +70,8 @@ in { Type = Union "https://kojipkgs.fedoraproject.org/repos/rawhide/latest/x86_64/" , F40 = "https://kojipkgs.fedoraproject.org/repos/f40-build/latest/x86_64/" - , F38 = - "https://kojipkgs.fedoraproject.org/repos/f38-build/latest/x86_64/" , F39 = "https://kojipkgs.fedoraproject.org/repos/f39-build/latest/x86_64/" - , Epel8 = - "https://kojipkgs.fedoraproject.org/repos/epel8-build/latest/x86_64/" , Epel9 = "https://kojipkgs.fedoraproject.org/repos/epel9-build/latest/x86_64/" , Epel9Next = @@ -99,6 +79,5 @@ in { Type = Union } branch , isRawhide - , isEpel8 = λ(branch : Union) → merge (eq_def ⫽ { Epel8 = True }) branch , isEpel9 = λ(branch : Union) → merge (eq_def ⫽ { Epel9 = True }) branch } diff --git a/FZCI.dhall/Nodesets.dhall b/FZCI.dhall/Nodesets.dhall index e2c5f50..8a9405f 100644 --- a/FZCI.dhall/Nodesets.dhall +++ b/FZCI.dhall/Nodesets.dhall @@ -1,51 +1,35 @@ let Zuul = (./Imports.dhall).Zuul -let latest-version = "38" +let latest-version = "40" let Nodeset = let Union = < Fedora-Latest-Container + | Fedora-40-Container | Fedora-39-Container - | Fedora-38-Container - | Fedora-37-Container - | Centos-8-Container - | Centos-7-Container | Fedora-Rawhide-VM | Fedora-Latest-VM | Fedora-40-VM | Fedora-39-VM - | Fedora-38-VM - | Fedora-37-VM | Fedora-Rawhide-VM-Medium | Fedora-Latest-VM-Medium | Fedora-40-VM-Medium | Fedora-39-VM-Medium - | Fedora-38-VM-Medium - | Fedora-37-VM-Medium - | Centos-8-VM | Centos-Stream-9-VM > let all = [ Union.Fedora-Latest-Container + , Union.Fedora-40-Container , Union.Fedora-39-Container - , Union.Fedora-38-Container - , Union.Fedora-37-Container - , Union.Centos-8-Container - , Union.Centos-7-Container , Union.Fedora-Rawhide-VM , Union.Fedora-Latest-VM , Union.Fedora-40-VM , Union.Fedora-39-VM - , Union.Fedora-38-VM - , Union.Fedora-37-VM , Union.Fedora-Rawhide-VM-Medium , Union.Fedora-Latest-VM-Medium , Union.Fedora-40-VM-Medium , Union.Fedora-39-VM-Medium - , Union.Fedora-38-VM-Medium - , Union.Fedora-37-VM-Medium - , Union.Centos-8-VM , Union.Centos-Stream-9-VM ] @@ -68,16 +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-39-Container = create "fedora-39-container" "zuul-worker-f39" "container" - , Fedora-38-Container = - create "fedora-38-container" "zuul-worker-f38" "container" - , Fedora-37-Container = - create "fedora-37-container" "zuul-worker-f37" "container" - , Centos-8-Container = - create "centos-8-container" "pod-centos-8" "container" - , Centos-7-Container = - create "centos-7-container" "pod-centos-7" "container" , Fedora-Rawhide-VM = create "fedora-rawhide-vm" @@ -92,10 +70,6 @@ let Nodeset = create "fedora-40-vm" "cloud-fedora-40-small" "cloud-host" , Fedora-39-VM = create "fedora-39-vm" "cloud-fedora-39-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-Rawhide-VM-Medium = create "fedora-rawhide-vm-medium" @@ -116,18 +90,6 @@ let Nodeset = "fedora-39-vm-medium" "cloud-fedora-39-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" - "cloud-fedora-37-medium" - "cloud-host" - , Centos-8-VM = - create "centos-8-vm" "cloud-centos-8-stream" "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 ede2019..c80ce1c 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-38-Container +let default_nodeset = Nodesets.getName Nodesets.Type.Fedora-40-Container let check_for_sti_tests = Zuul.Job::{ @@ -119,7 +119,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 default_nodeset + , nodeset = Some (Nodesets.getName Nodesets.Type.Fedora-39-Container) , roles = Some [ { zuul = "zuul-distro-jobs" } ] , run = Some "playbooks/koji/clean-stalled-koji-tasks.yaml" , secrets = Some @@ -243,10 +243,8 @@ let getTestingFarmJobVars = let name = merge { Rawhide = "Fedora-Rawhide" - , F38 = "Fedora-38" , F39 = "Fedora-39" , F40 = "Fedora-40" - , Epel8 = "CentOS-Stream-8" , Epel9 = "CentOS-Stream-9" , Epel9Next = "CentOS-Stream-9" } @@ -255,10 +253,8 @@ let getTestingFarmJobVars = let distro = merge { Rawhide = "fedora-rawhide" - , F38 = "fedora-38" , F39 = "fedora-39" , F40 = "fedora-40" - , Epel8 = "centos-stream-8" , Epel9 = "centos-stream-9" , Epel9Next = "centos-stream-9" } @@ -331,23 +327,23 @@ let generateTMTTestsJobs = Branches.all let generateGenericTMTTestJob = - Zuul.Job::{ - , name = "tmt-test" - , description = Some "Running generic tmt test on Testing Farm" - , final = Some False - , timeout = Some 21600 - , nodeset = Some default_nodeset - , secrets = Some - [ Zuul.Job.Secret::{ - , name = "testing_farm_zuul_ci_key" - , secret = "testing_farm_zuul_ci_key" - } - ] - , run = Some "playbooks/testing-farm-generic/run.yaml" - , post-run = Some [ "playbooks/testing-farm-generic/fetch.yaml" ] - , vars = Some ( Zuul.Vars.object ( toMap { test_type = Zuul.Vars.string "fmf" } ) ) - } - + Zuul.Job::{ + , name = "tmt-test" + , description = Some "Running generic tmt test on Testing Farm" + , final = Some False + , timeout = Some 21600 + , nodeset = Some default_nodeset + , secrets = Some + [ Zuul.Job.Secret::{ + , name = "testing_farm_zuul_ci_key" + , secret = "testing_farm_zuul_ci_key" + } + ] + , run = Some "playbooks/testing-farm-generic/run.yaml" + , post-run = Some [ "playbooks/testing-farm-generic/fetch.yaml" ] + , vars = Some + (Zuul.Vars.object (toMap { test_type = Zuul.Vars.string "fmf" })) + } let Jobs = [ clean_stalled_koji_tasks diff --git a/FZCI.dhall/fedora-zuul-jobs/jobs.dhall b/FZCI.dhall/fedora-zuul-jobs/jobs.dhall index b0d78e9..5048609 100644 --- a/FZCI.dhall/fedora-zuul-jobs/jobs.dhall +++ b/FZCI.dhall/fedora-zuul-jobs/jobs.dhall @@ -35,10 +35,8 @@ let createRpmInstallTestJob λ(branch : Branches.Type) → merge { Rawhide = Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM - , F38 = Nodesets.getName Nodesets.Type.Fedora-38-VM , F39 = Nodesets.getName Nodesets.Type.Fedora-39-VM , F40 = Nodesets.getName Nodesets.Type.Fedora-40-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 @@ -58,7 +56,7 @@ let createRpmInstallTestJob } let job = - if Branches.isEpel9 branch || Branches.isEpel8 branch + if Branches.isEpel9 branch then job ⫽ { pre-run = Some [ "playbooks/epel8/install.yaml" ] } else job ⫽ { vars = Some (createJobVars (Branches.kojirepos branch)) @@ -74,10 +72,8 @@ let createRpmTestJob merge { Rawhide = Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM-Medium - , F38 = Nodesets.getName Nodesets.Type.Fedora-38-VM-Medium , F39 = Nodesets.getName Nodesets.Type.Fedora-39-VM-Medium , F40 = Nodesets.getName Nodesets.Type.Fedora-40-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 @@ -101,11 +97,6 @@ let createRpmTestJob } let job = - if Branches.isEpel8 branch - then job ⫽ { pre-run = Some [ "playbooks/epel8/install.yaml" ] } - else job - - let job = if Branches.isEpel9 branch then job ⫽ { pre-run = Some [ "playbooks/epel8/install.yaml" ] } else job @@ -125,7 +116,7 @@ let createRpmInspectJob , requires = Some [ "repo" ] , branches = Branches.zuulBranch branch , nodeset = Some - (Nodesets.getName Nodesets.Type.Fedora-38-Container) + (Nodesets.getName Nodesets.Type.Fedora-40-Container) , vars = Some ( Zuul.Vars.object [ { mapKey = "rpminspect_cmd" @@ -148,7 +139,7 @@ let rpm_linter_job = , name = "rpm-linter" , parent = Some "repo-rpm-lint" , requires = Some [ "repo" ] - , nodeset = Some (Nodesets.getName Nodesets.Type.Fedora-38-Container) + , nodeset = Some (Nodesets.getName Nodesets.Type.Fedora-40-Container) , branches = Some Branches.allText , voting = Some False }