From 99a26bb4e3bc73e2e287618a3a4a0a1c33d84481 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Aug 14 2025 15:10:17 +0000 Subject: [PATCH 1/2] Move clean_stalled_koji_tasks back to default_nodeset --- diff --git a/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall b/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall index bada14d..b756d93 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-40-Container) + , nodeset = Some default_nodeset , roles = Some [ { zuul = "zuul-distro-jobs" } ] , run = Some "playbooks/koji/clean-stalled-koji-tasks.yaml" , secrets = Some From 83ad160f574f7906ae1bb4edb77da7be3bb8ed09 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Aug 18 2025 10:33:37 +0000 Subject: [PATCH 2/2] Add F41 nodeset Use F41 nodeset as default --- diff --git a/FZCI.dhall/Nodesets.dhall b/FZCI.dhall/Nodesets.dhall index fbb1bcb..fe8cc55 100644 --- a/FZCI.dhall/Nodesets.dhall +++ b/FZCI.dhall/Nodesets.dhall @@ -6,6 +6,7 @@ let Nodeset = let Union = < Fedora-Latest-Container | Fedora-40-Container + | Fedora-41-Container | Fedora-Rawhide-VM | Fedora-Latest-VM | Fedora-42-VM @@ -22,6 +23,7 @@ let Nodeset = let all = [ Union.Fedora-Latest-Container , Union.Fedora-40-Container + , Union.Fedora-41-Container , Union.Fedora-Rawhide-VM , Union.Fedora-Latest-VM , Union.Fedora-42-VM @@ -56,6 +58,8 @@ let Nodeset = "container" , Fedora-40-Container = create "fedora-40-container" "zuul-worker-f40" "container" + , Fedora-41-Container = + create "fedora-41-container" "zuul-worker-f41" "container" , Fedora-Rawhide-VM = create "fedora-rawhide-vm" diff --git a/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall b/FZCI.dhall/fedora-zuul-jobs-config/jobs.dhall index b756d93..003b749 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-40-Container +let default_nodeset = Nodesets.getName Nodesets.Type.Fedora-41-Container let check_for_sti_tests = Zuul.Job::{ diff --git a/FZCI.dhall/fedora-zuul-jobs/jobs.dhall b/FZCI.dhall/fedora-zuul-jobs/jobs.dhall index 4f2cc8f..ef8ed2c 100644 --- a/FZCI.dhall/fedora-zuul-jobs/jobs.dhall +++ b/FZCI.dhall/fedora-zuul-jobs/jobs.dhall @@ -118,7 +118,7 @@ let createRpmInspectJob , requires = Some [ "repo" ] , branches = Branches.zuulBranch branch , nodeset = Some - (Nodesets.getName Nodesets.Type.Fedora-40-Container) + (Nodesets.getName Nodesets.Type.Fedora-41-Container) , vars = Some ( Zuul.Vars.object [ { mapKey = "rpminspect_cmd"