From 0e4cc9fbe12a394a39d808c21632d49f738dda44 Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Feb 02 2023 09:41:49 +0000 Subject: Remove EOL Fedora nodesets Those nodesets uses Fedora distro, which is End of Life and should not be in use anymore. --- diff --git a/FZCI.dhall/Branches.dhall b/FZCI.dhall/Branches.dhall index 08676be..1b89c00 100644 --- a/FZCI.dhall/Branches.dhall +++ b/FZCI.dhall/Branches.dhall @@ -4,11 +4,10 @@ let Arches = ./Arches.dhall let --| When changing that union, update the `all` attribute too Union = - < Rawhide | F35 | F36 | F37 | Epel8 | Epel9 > + < Rawhide | F36 | F37 | Epel8 | Epel9 > let eq_def = { Rawhide = False - , F35 = False , F36 = False , F37 = False , Epel8 = False @@ -19,7 +18,6 @@ let show = λ(branch : Union) → merge { Rawhide = "rawhide" - , F35 = "f35" , F36 = "f36" , F37 = "f37" , Epel8 = "epel8" @@ -27,14 +25,7 @@ let show = } branch -let all = - [ Union.Rawhide - , Union.F37 - , Union.F36 - , Union.F35 - , Union.Epel8 - , Union.Epel9 - ] +let all = [ Union.Rawhide, Union.F37, Union.F36, Union.Epel8, Union.Epel9 ] let isRawhide = λ(branch : Union) → merge (eq_def ⫽ { Rawhide = True }) branch @@ -56,7 +47,6 @@ in { Type = Union λ(branch : Union) → merge { Rawhide = "rawhide" - , F35 = "f35" , F36 = "f36" , F37 = "f37" , Epel8 = "epel8" @@ -73,7 +63,6 @@ in { Type = Union Prelude.Bool.not (Arches.isARMV7HL arch) ) Arches.fedora - , F35 = Arches.fedora , F36 = Arches.fedora , F37 = Prelude.List.filter @@ -91,8 +80,6 @@ in { Type = Union merge { Rawhide = "https://kojipkgs.fedoraproject.org/repos/rawhide/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 = diff --git a/FZCI.dhall/Nodesets.dhall b/FZCI.dhall/Nodesets.dhall index 9a35a25..48116a5 100644 --- a/FZCI.dhall/Nodesets.dhall +++ b/FZCI.dhall/Nodesets.dhall @@ -7,34 +7,16 @@ let Nodeset = < Fedora-Latest-Container | Fedora-37-Container | Fedora-36-Container - | Fedora-35-Container - | Fedora-34-Container - | Fedora-33-Container - | Fedora-32-Container - | Fedora-31-Container - | Fedora-30-Container | Centos-8-Container | Centos-7-Container | Fedora-Rawhide-VM | Fedora-Latest-VM | Fedora-37-VM | Fedora-36-VM - | Fedora-35-VM - | Fedora-34-VM - | Fedora-33-VM - | Fedora-32-VM - | Fedora-31-VM - | 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 - | Fedora-33-VM-Medium - | Fedora-32-VM-Medium - | Fedora-31-VM-Medium - | Fedora-30-VM-Medium | Centos-8-VM | Centos-Stream-9-VM > @@ -43,34 +25,16 @@ let Nodeset = [ Union.Fedora-Latest-Container , Union.Fedora-37-Container , Union.Fedora-36-Container - , Union.Fedora-35-Container - , Union.Fedora-34-Container - , Union.Fedora-33-Container - , Union.Fedora-32-Container - , Union.Fedora-31-Container - , Union.Fedora-30-Container , Union.Centos-8-Container , 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 - , Union.Fedora-33-VM - , Union.Fedora-32-VM - , Union.Fedora-31-VM - , 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 - , Union.Fedora-33-VM-Medium - , Union.Fedora-32-VM-Medium - , Union.Fedora-31-VM-Medium - , Union.Fedora-30-VM-Medium , Union.Centos-8-VM , Union.Centos-Stream-9-VM ] @@ -98,18 +62,6 @@ let Nodeset = create "fedora-37-container" "zuul-worker-f37" "container" , Fedora-36-Container = create "fedora-36-container" "zuul-worker-f36" "container" - , Fedora-35-Container = - create "fedora-35-container" "zuul-worker-f35" "container" - , Fedora-34-Container = - create "fedora-34-container" "zuul-worker-f34" "container" - , Fedora-33-Container = - create "fedora-33-container" "pod-fedora-33" "container" - , Fedora-32-Container = - create "fedora-32-container" "pod-fedora-32" "container" - , Fedora-31-Container = - create "fedora-31-container" "pod-fedora-31" "container" - , Fedora-30-Container = - create "fedora-30-container" "pod-fedora-30" "container" , Centos-8-Container = create "centos-8-container" "pod-centos-8" "container" , Centos-7-Container = @@ -128,18 +80,6 @@ let Nodeset = 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 = - create "fedora-35-vm" "cloud-fedora-35-small" "cloud-host" - , Fedora-34-VM = - create "fedora-34-vm" "cloud-fedora-34-small" "cloud-host" - , Fedora-33-VM = - create "fedora-33-vm" "cloud-fedora-33-small" "cloud-host" - , Fedora-32-VM = - create "fedora-32-vm" "cloud-fedora-32-small" "cloud-host" - , Fedora-31-VM = - create "fedora-31-vm" "cloud-fedora-31-small" "cloud-host" - , Fedora-30-VM = - create "fedora-30-vm" "cloud-fedora-30-small" "cloud-host" , Fedora-Rawhide-VM-Medium = create "fedora-rawhide-vm-medium" @@ -160,36 +100,6 @@ let Nodeset = "fedora-36-vm-medium" "cloud-fedora-36-medium" "cloud-host" - , Fedora-35-VM-Medium = - create - "fedora-35-vm-medium" - "cloud-fedora-35-medium" - "cloud-host" - , Fedora-34-VM-Medium = - create - "fedora-34-vm-medium" - "cloud-fedora-34-medium" - "cloud-host" - , Fedora-33-VM-Medium = - create - "fedora-33-vm-medium" - "cloud-fedora-33-medium" - "cloud-host" - , Fedora-32-VM-Medium = - create - "fedora-32-vm-medium" - "cloud-fedora-32-medium" - "cloud-host" - , Fedora-31-VM-Medium = - create - "fedora-31-vm-medium" - "cloud-fedora-31-medium" - "cloud-host" - , Fedora-30-VM-Medium = - create - "fedora-30-vm-medium" - "cloud-fedora-30-medium" - "cloud-host" , Centos-8-VM = create "centos-8-vm" "cloud-centos-8-stream" "cloud-host" , 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 72489de..3a46d61 100644 --- a/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall +++ b/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall @@ -214,7 +214,6 @@ let getTestingFarmJobVars = let name = merge { Rawhide = "Fedora-Rawhide" - , F35 = "Fedora-35" , F36 = "Fedora-36" , F37 = "Fedora-37" , Epel8 = "CentOS-Stream-8" @@ -225,7 +224,6 @@ let getTestingFarmJobVars = let distro = merge { Rawhide = "fedora-rawhide" - , F35 = "fedora-35" , F36 = "fedora-36" , F37 = "fedora-37" , Epel8 = "centos-stream-8" diff --git a/FZCI.dhall/fedora-zuul-jobs/jobs.dhall b/FZCI.dhall/fedora-zuul-jobs/jobs.dhall index 976b7f4..f62670f 100644 --- a/FZCI.dhall/fedora-zuul-jobs/jobs.dhall +++ b/FZCI.dhall/fedora-zuul-jobs/jobs.dhall @@ -35,7 +35,6 @@ let createRpmInstallTestJob λ(branch : Branches.Type) → merge { Rawhide = Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM - , 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 @@ -76,7 +75,6 @@ let createRpmTestJob merge { Rawhide = Nodesets.getName Nodesets.Type.Fedora-Rawhide-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