From b508b131f0a7855c3b3b67efc71c48182421f648 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Jan 05 2026 16:02:05 +0000 Subject: Drop F40 and F41, add F42 containers and F43, make F43 latest Signed-off-by: Adam Williamson --- diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index ef0c7d1..436a9ca 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -19,27 +19,11 @@ - job: name: rpm-install-test - description: "Install the built rpms (f42 variant)" - run: playbooks/rpm/rpm-install-test.yaml - branches: - - f42 - nodeset: fedora-42-vm - requires: - - repo - roles: - - zuul: zuul-distro-jobs - vars: - repos: - - name: distro-build - url: https://kojipkgs.fedoraproject.org/repos/f42-build/latest/x86_64/ - -- job: - name: rpm-install-test - description: "Install the built rpms (f41 variant)" + description: "Install the built rpms (f43 variant)" run: playbooks/rpm/rpm-install-test.yaml branches: - - f41 - nodeset: fedora-41-vm + - f43 + nodeset: fedora-43-vm requires: - repo roles: @@ -47,15 +31,15 @@ vars: repos: - name: distro-build - url: https://kojipkgs.fedoraproject.org/repos/f41-build/latest/x86_64/ + url: https://kojipkgs.fedoraproject.org/repos/f43-build/latest/x86_64/ - job: name: rpm-install-test - description: "Install the built rpms (f40 variant)" + description: "Install the built rpms (f42 variant)" run: playbooks/rpm/rpm-install-test.yaml branches: - - f40 - nodeset: fedora-40-vm + - f42 + nodeset: fedora-42-vm requires: - repo roles: @@ -63,7 +47,7 @@ vars: repos: - name: distro-build - url: https://kojipkgs.fedoraproject.org/repos/f40-build/latest/x86_64/ + url: https://kojipkgs.fedoraproject.org/repos/f42-build/latest/x86_64/ - job: name: rpm-install-test @@ -117,32 +101,13 @@ - job: name: rpm-test - description: "Install the built rpms and run STI tests (f42 variant)" - run: playbooks/rpm/rpmtest.yaml - post-run: - - playbooks/rpm/rpmtest-fetch-artifacts.yaml - branches: - - f42 - nodeset: fedora-42-vm-medium - requires: - - repo - roles: - - zuul: zuul-distro-jobs - timeout: 18000 - vars: - repos: - - name: distro-build - url: https://kojipkgs.fedoraproject.org/repos/f42-build/latest/x86_64/ - -- job: - name: rpm-test - description: "Install the built rpms and run STI tests (f41 variant)" + description: "Install the built rpms and run STI tests (f43 variant)" run: playbooks/rpm/rpmtest.yaml post-run: - playbooks/rpm/rpmtest-fetch-artifacts.yaml branches: - - f41 - nodeset: fedora-41-vm-medium + - f43 + nodeset: fedora-43-vm-medium requires: - repo roles: @@ -151,17 +116,17 @@ vars: repos: - name: distro-build - url: https://kojipkgs.fedoraproject.org/repos/f41-build/latest/x86_64/ + url: https://kojipkgs.fedoraproject.org/repos/f43-build/latest/x86_64/ - job: name: rpm-test - description: "Install the built rpms and run STI tests (f40 variant)" + description: "Install the built rpms and run STI tests (f42 variant)" run: playbooks/rpm/rpmtest.yaml post-run: - playbooks/rpm/rpmtest-fetch-artifacts.yaml branches: - - f40 - nodeset: fedora-40-vm-medium + - f42 + nodeset: fedora-42-vm-medium requires: - repo roles: @@ -170,7 +135,7 @@ vars: repos: - name: distro-build - url: https://kojipkgs.fedoraproject.org/repos/f40-build/latest/x86_64/ + url: https://kojipkgs.fedoraproject.org/repos/f42-build/latest/x86_64/ - job: name: rpm-test @@ -219,7 +184,7 @@ branches: - rawhide - main - nodeset: fedora-41-container + nodeset: fedora-latest-container requires: - repo vars: @@ -230,44 +195,30 @@ - job: name: rpm-rpminspect parent: rpminspect - description: "Run the rpminspect report tests (f42 variant)" - branches: - - f42 - nodeset: fedora-41-container - requires: - - repo - vars: - check_previous_build_enabled: true - rpminspect_cmd: rpminspect-fedora - target: f42 - -- job: - name: rpm-rpminspect - parent: rpminspect - description: "Run the rpminspect report tests (f41 variant)" + description: "Run the rpminspect report tests (f43 variant)" branches: - - f41 - nodeset: fedora-41-container + - f43 + nodeset: fedora-latest-container requires: - repo vars: check_previous_build_enabled: true rpminspect_cmd: rpminspect-fedora - target: f41 + target: f43 - job: name: rpm-rpminspect parent: rpminspect - description: "Run the rpminspect report tests (f40 variant)" + description: "Run the rpminspect report tests (f42 variant)" branches: - - f40 - nodeset: fedora-41-container + - f42 + nodeset: fedora-latest-container requires: - repo vars: check_previous_build_enabled: true rpminspect_cmd: rpminspect-fedora - target: f40 + target: f42 - job: name: rpm-rpminspect @@ -275,7 +226,7 @@ description: "Run the rpminspect report tests (epel9 variant)" branches: - epel9 - nodeset: fedora-41-container + nodeset: fedora-latest-container requires: - repo vars: @@ -289,7 +240,7 @@ description: "Run the rpminspect report tests (epel9-next variant)" branches: - epel9-next - nodeset: fedora-41-container + nodeset: fedora-latest-container requires: - repo vars: @@ -302,9 +253,8 @@ parent: repo-rpm-lint branches: - rawhide + - f43 - f42 - - f41 - - f40 - epel9 - epel9-next - main diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index 4f26dfb..8b3cfcd 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -3,19 +3,19 @@ - nodeset: name: fedora-latest-container nodes: - - label: zuul-worker-f41 + - label: zuul-worker-f43 name: container - nodeset: - name: fedora-40-container + name: fedora-43-container nodes: - - label: zuul-worker-f40 + - label: zuul-worker-f43 name: container - nodeset: - name: fedora-41-container + name: fedora-42-container nodes: - - label: zuul-worker-f41 + - label: zuul-worker-f42 name: container - nodeset: @@ -27,25 +27,19 @@ - nodeset: name: fedora-latest-vm nodes: - - label: cloud-fedora-41-small + - label: cloud-fedora-43-small name: cloud-host - nodeset: - name: fedora-42-vm - nodes: - - label: cloud-fedora-42-small - name: cloud-host - -- nodeset: - name: fedora-41-vm + name: fedora-43-vm nodes: - - label: cloud-fedora-41-small + - label: cloud-fedora-43-small name: cloud-host - nodeset: - name: fedora-40-vm + name: fedora-42-vm nodes: - - label: cloud-fedora-40-small + - label: cloud-fedora-42-small name: cloud-host - nodeset: @@ -57,25 +51,19 @@ - nodeset: name: fedora-latest-vm-medium nodes: - - label: cloud-fedora-41-medium + - label: cloud-fedora-43-medium name: cloud-host - nodeset: - name: fedora-42-vm-medium - nodes: - - label: cloud-fedora-42-medium - name: cloud-host - -- nodeset: - name: fedora-41-vm-medium + name: fedora-43-vm-medium nodes: - - label: cloud-fedora-41-medium + - label: cloud-fedora-43-medium name: cloud-host - nodeset: - name: fedora-40-vm-medium + name: fedora-42-vm-medium nodes: - - label: cloud-fedora-40-medium + - label: cloud-fedora-42-medium name: cloud-host - nodeset: