From ad3af0a3a74445968458f9644b3ab578bba8bac5 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Jan 05 2026 17:22:52 +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 aa1686d..2c97659 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -4,7 +4,7 @@ name: clean-stalled-koji-tasks description: Cancel Koji tasks running for more than 12 hours run: playbooks/koji/clean-stalled-koji-tasks.yaml - nodeset: fedora-41-container + nodeset: fedora-latest-container protected: true roles: - zuul: zuul-distro-jobs @@ -18,7 +18,6 @@ run: playbooks/rpm/check-for-sti-tests.yaml branches: - f42 - - f41 nodeset: nodes: [] @@ -28,9 +27,8 @@ run: playbooks/rpm/check-for-fmf-tests.yaml branches: - rawhide + - f43 - f42 - - f41 - - f40 - epel9 - epel9-next - main @@ -43,13 +41,12 @@ run: playbooks/rpm/check-for-arches-ng.yaml branches: - rawhide + - f43 - f42 - - f41 - - f40 - epel9 - epel9-next - main - nodeset: fedora-41-container + nodeset: fedora-latest-container voting: false - job: @@ -60,7 +57,7 @@ - name: playbooks/koji/cleanup.yaml cleanup: true abstract: true - nodeset: fedora-41-container + nodeset: fedora-latest-container protected: true roles: - zuul: zuul-distro-jobs @@ -102,7 +99,7 @@ post-run: - playbooks/testing-farm-generic/fetch.yaml final: false - nodeset: fedora-41-container + nodeset: fedora-latest-container secrets: - name: testing_farm_zuul_ci_key secret: testing_farm_zuul_ci_key @@ -194,226 +191,151 @@ name: rpm-scratch-build parent: common-koji-rpm-build branches: - - f42 - final: true - provides: - - repo - vars: - arches: x86_64 - fetch_artifacts: true - release: f42 - scratch_build: true - target: f42 - -- job: - name: rpm-scratch-build-s390x - parent: common-koji-rpm-build - branches: - - f42 - dependencies: - - check-for-arches - final: true - vars: - arches: s390x - fetch_artifacts: false - release: f42 - scratch_build: true - target: f42 - -- job: - name: rpm-scratch-build-ppc64le - parent: common-koji-rpm-build - branches: - - f42 - dependencies: - - check-for-arches - final: true - vars: - arches: ppc64le - fetch_artifacts: false - release: f42 - scratch_build: true - target: f42 - -- job: - name: rpm-scratch-build-i686 - parent: common-koji-rpm-build - branches: - - f42 - dependencies: - - check-for-arches - final: true - vars: - arches: i686 - fetch_artifacts: false - release: f42 - scratch_build: true - target: f42 - -- job: - name: rpm-scratch-build-aarch64 - parent: common-koji-rpm-build - branches: - - f42 - dependencies: - - check-for-arches - final: true - vars: - arches: aarch64 - fetch_artifacts: false - release: f42 - scratch_build: true - target: f42 - -- job: - name: rpm-scratch-build - parent: common-koji-rpm-build - branches: - - f41 + - f43 final: true provides: - repo vars: arches: x86_64 fetch_artifacts: true - release: f41 + release: f43 scratch_build: true - target: f41 + target: f43 - job: name: rpm-scratch-build-s390x parent: common-koji-rpm-build branches: - - f41 + - f43 dependencies: - check-for-arches final: true vars: arches: s390x fetch_artifacts: false - release: f41 + release: f43 scratch_build: true - target: f41 + target: f43 - job: name: rpm-scratch-build-ppc64le parent: common-koji-rpm-build branches: - - f41 + - f43 dependencies: - check-for-arches final: true vars: arches: ppc64le fetch_artifacts: false - release: f41 + release: f43 scratch_build: true - target: f41 + target: f43 - job: name: rpm-scratch-build-i686 parent: common-koji-rpm-build branches: - - f41 + - f43 dependencies: - check-for-arches final: true vars: arches: i686 fetch_artifacts: false - release: f41 + release: f43 scratch_build: true - target: f41 + target: f43 - job: name: rpm-scratch-build-aarch64 parent: common-koji-rpm-build branches: - - f41 + - f43 dependencies: - check-for-arches final: true vars: arches: aarch64 fetch_artifacts: false - release: f41 + release: f43 scratch_build: true - target: f41 + target: f43 - job: name: rpm-scratch-build parent: common-koji-rpm-build branches: - - f40 + - f42 final: true provides: - repo vars: arches: x86_64 fetch_artifacts: true - release: f40 + release: f42 scratch_build: true - target: f40 + target: f42 - job: name: rpm-scratch-build-s390x parent: common-koji-rpm-build branches: - - f40 + - f42 dependencies: - check-for-arches final: true vars: arches: s390x fetch_artifacts: false - release: f40 + release: f42 scratch_build: true - target: f40 + target: f42 - job: name: rpm-scratch-build-ppc64le parent: common-koji-rpm-build branches: - - f40 + - f42 dependencies: - check-for-arches final: true vars: arches: ppc64le fetch_artifacts: false - release: f40 + release: f42 scratch_build: true - target: f40 + target: f42 - job: name: rpm-scratch-build-i686 parent: common-koji-rpm-build branches: - - f40 + - f42 dependencies: - check-for-arches final: true vars: arches: i686 fetch_artifacts: false - release: f40 + release: f42 scratch_build: true - target: f40 + target: f42 - job: name: rpm-scratch-build-aarch64 parent: common-koji-rpm-build branches: - - f40 + - f42 dependencies: - check-for-arches final: true vars: arches: aarch64 fetch_artifacts: false - release: f40 + release: f42 scratch_build: true - target: f40 + target: f42 - job: name: rpm-scratch-build @@ -522,37 +444,25 @@ name: rpm-build parent: common-koji-rpm-build branches: - - f42 - final: true - vars: - fetch_artifacts: false - release: f42 - scratch_build: false - target: f42 - -- job: - name: rpm-build - parent: common-koji-rpm-build - branches: - - f41 + - f43 final: true vars: fetch_artifacts: false - release: f41 + release: f43 scratch_build: false - target: f41 + target: f43 - job: name: rpm-build parent: common-koji-rpm-build branches: - - f40 + - f42 final: true vars: fetch_artifacts: false - release: f40 + release: f42 scratch_build: false - target: f40 + target: f42 - job: name: rpm-build @@ -588,7 +498,7 @@ - rawhide - main final: true - nodeset: fedora-41-container + nodeset: fedora-latest-container requires: - repo roles: @@ -610,9 +520,9 @@ post-run: - playbooks/testing-farm/fetch.yaml branches: - - f42 + - f43 final: true - nodeset: fedora-41-container + nodeset: fedora-latest-container requires: - repo roles: @@ -623,8 +533,8 @@ secret: testing_farm_zuul_ci_key timeout: 21600 vars: - compose: Fedora-42 - distro: fedora-42 + compose: Fedora-43 + distro: fedora-43 test_type: fmf - job: @@ -634,33 +544,9 @@ post-run: - playbooks/testing-farm/fetch.yaml branches: - - f41 - final: true - nodeset: fedora-41-container - requires: - - repo - roles: - - zuul: zuul-distro-jobs - - zuul: fedora-zuul-jobs - secrets: - - name: testing_farm_zuul_ci_key - secret: testing_farm_zuul_ci_key - timeout: 21600 - vars: - compose: Fedora-41 - distro: fedora-41 - test_type: fmf - -- job: - name: rpm-tmt-test - description: Running fmf test on Testing Farm - run: playbooks/testing-farm/run.yaml - post-run: - - playbooks/testing-farm/fetch.yaml - branches: - - f40 + - f42 final: true - nodeset: fedora-41-container + nodeset: fedora-latest-container requires: - repo roles: @@ -671,8 +557,8 @@ secret: testing_farm_zuul_ci_key timeout: 21600 vars: - compose: Fedora-40 - distro: fedora-40 + compose: Fedora-42 + distro: fedora-42 test_type: fmf - job: @@ -684,7 +570,7 @@ branches: - epel9 final: true - nodeset: fedora-41-container + nodeset: fedora-latest-container requires: - repo roles: @@ -708,7 +594,7 @@ branches: - epel9-next final: true - nodeset: fedora-41-container + nodeset: fedora-latest-container requires: - repo roles: @@ -732,7 +618,7 @@ branches: - f42 final: true - nodeset: fedora-41-container + nodeset: fedora-latest-container requires: - repo roles: @@ -746,27 +632,3 @@ compose: Fedora-42 distro: fedora-42 test_type: sti - -- job: - name: rpm-sti-test - description: Running sti test on Testing Farm - run: playbooks/testing-farm/run.yaml - post-run: - - playbooks/testing-farm/fetch.yaml - branches: - - f41 - final: true - nodeset: fedora-41-container - requires: - - repo - roles: - - zuul: zuul-distro-jobs - - zuul: fedora-zuul-jobs - secrets: - - name: testing_farm_zuul_ci_key - secret: testing_farm_zuul_ci_key - timeout: 21600 - vars: - compose: Fedora-41 - distro: fedora-41 - test_type: sti