From 9a6dd076b0d54bdb6054376e86cfa7c4e9b3c0ad Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 25 Jul 2025 06:41:16 -0700 Subject: [PATCH] Remove xenial test jobs We don't have xenial images anymore, and we're about to drop ansible-8. Also, some jobs were configured to run on fedora-36 nodes; those haven't existed for a while. Mark them non-voting and remove their nodesets until someone can fix them. Change-Id: I2c8c61195001bbee485c63c55f06b6a37ed32b92 --- zuul-tests.d/general-roles-jobs.yaml | 106 ++++++++++++++++++--------- zuul-tests.d/haskell.yaml | 25 ++++--- 2 files changed, 87 insertions(+), 44 deletions(-) diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml index cddd0b43b..bffcdfc44 100644 --- a/zuul-tests.d/general-roles-jobs.yaml +++ b/zuul-tests.d/general-roles-jobs.yaml @@ -193,19 +193,6 @@ - name: ubuntu-noble label: ubuntu-noble -- job: - name: zuul-jobs-test-base-roles-ubuntu-xenial - description: Tests roles in the 'base' job on ubuntu-xenial - parent: zuul-jobs-test-base-roles - # Note this is manually curated since xenial is not really - # supported on opendev, but we want the job to run until the last - # possible moment. - ansible-version: '8' - nodeset: - nodes: - - name: ubuntu-xenial - label: ubuntu-xenial - - job: name: zuul-jobs-test-base-test-roles description: | @@ -299,19 +286,6 @@ - name: ubuntu-noble label: ubuntu-noble -- job: - name: zuul-jobs-test-base-test-roles-ubuntu-xenial - description: Tests roles in the 'base-test' job on ubuntu-xenial - parent: zuul-jobs-test-base-test-roles - # Note this is manually curated since xenial is not really - # supported on opendev, but we want the job to run until the last - # possible moment. - ansible-version: '8' - nodeset: - nodes: - - name: ubuntu-xenial - label: ubuntu-xenial - - job: name: zuul-jobs-test-bindep description: Test the bindep role @@ -729,10 +703,11 @@ - test-playbooks/shake/.* pre-run: - test-playbooks/shake/setup-project.yaml + voting: false nodeset: - nodes: - - name: fedora-36 - label: fedora-36 + # This used to run on fedora-36; it needs a new nodeset defined + # and made voting. + nodes: [] - job: name: zuul-jobs-test-ensure-zookeeper @@ -972,7 +947,7 @@ - project: check: - jobs: &id001 + jobs: - zuul-jobs-test-add-authorized-keys - zuul-jobs-test-add-gpgkey - zuul-jobs-test-add-sshkey @@ -983,14 +958,12 @@ - zuul-jobs-test-base-roles-ubuntu-focal - zuul-jobs-test-base-roles-ubuntu-jammy - zuul-jobs-test-base-roles-ubuntu-noble - - zuul-jobs-test-base-roles-ubuntu-xenial - zuul-jobs-test-base-test-roles-centos-9-stream - zuul-jobs-test-base-test-roles-debian-bookworm - zuul-jobs-test-base-test-roles-debian-bullseye - zuul-jobs-test-base-test-roles-ubuntu-focal - zuul-jobs-test-base-test-roles-ubuntu-jammy - zuul-jobs-test-base-test-roles-ubuntu-noble - - zuul-jobs-test-base-test-roles-ubuntu-xenial - zuul-jobs-test-bindep-centos-9-stream - zuul-jobs-test-bindep-debian-bookworm - zuul-jobs-test-bindep-debian-bullseye @@ -1044,6 +1017,73 @@ - zuul-jobs-test-zuul-tenant-conf-check - zuul-jobs-test-limit-log-files gate: - jobs: *id001 + jobs: &id001 + - zuul-jobs-test-add-authorized-keys + - zuul-jobs-test-add-gpgkey + - zuul-jobs-test-add-sshkey + - zuul-jobs-test-encrypt-file + - zuul-jobs-test-base-roles-centos-9-stream + - zuul-jobs-test-base-roles-debian-bookworm + - zuul-jobs-test-base-roles-debian-bullseye + - zuul-jobs-test-base-roles-ubuntu-focal + - zuul-jobs-test-base-roles-ubuntu-jammy + - zuul-jobs-test-base-roles-ubuntu-noble + - zuul-jobs-test-base-test-roles-centos-9-stream + - zuul-jobs-test-base-test-roles-debian-bookworm + - zuul-jobs-test-base-test-roles-debian-bullseye + - zuul-jobs-test-base-test-roles-ubuntu-focal + - zuul-jobs-test-base-test-roles-ubuntu-jammy + - zuul-jobs-test-base-test-roles-ubuntu-noble + - zuul-jobs-test-bindep-centos-9-stream + - zuul-jobs-test-bindep-debian-bookworm + - zuul-jobs-test-bindep-debian-bullseye + - zuul-jobs-test-bindep-ubuntu-focal + - zuul-jobs-test-bindep-ubuntu-jammy + - zuul-jobs-test-bindep-ubuntu-noble + - zuul-jobs-test-clear-firewall + - zuul-jobs-test-enable-fips + - zuul-jobs-test-ensure-bazelisk + - zuul-jobs-test-netconsole + - zuul-jobs-test-validate-zone-db-debian-bookworm + - zuul-jobs-test-validate-zone-db-debian-bullseye + - zuul-jobs-test-validate-zone-db-ubuntu-focal + - zuul-jobs-test-validate-zone-db-ubuntu-jammy + - zuul-jobs-test-validate-zone-db-ubuntu-noble + - zuul-jobs-test-dstat-graph-centos-9-stream + - zuul-jobs-test-dstat-graph-debian-bookworm + - zuul-jobs-test-dstat-graph-debian-bullseye + - zuul-jobs-test-dstat-graph-ubuntu-focal + - zuul-jobs-test-dstat-graph-ubuntu-jammy + - zuul-jobs-test-dstat-graph-ubuntu-noble + - zuul-jobs-test-multinode-roles-centos-9-stream + - zuul-jobs-test-multinode-roles-debian-bookworm + - zuul-jobs-test-multinode-roles-debian-bullseye + - zuul-jobs-test-multinode-roles-ubuntu-focal + - zuul-jobs-test-multinode-roles-ubuntu-jammy + - zuul-jobs-test-multinode-roles-ubuntu-noble + - zuul-jobs-test-generate-zuul-manifest + - zuul-jobs-test-upload-artifactory + - zuul-jobs-test-upload-git-mirror + - zuul-jobs-test-ensure-zookeeper-debian-bookworm + - zuul-jobs-test-ensure-zookeeper-debian-bullseye + - zuul-jobs-test-ensure-zookeeper-ubuntu-focal + - zuul-jobs-test-ensure-zookeeper-ubuntu-jammy + - zuul-jobs-test-ensure-zookeeper-ubuntu-noble + - zuul-jobs-test-ensure-zookeeper-tmpfs-debian-bookworm + - zuul-jobs-test-ensure-zookeeper-tmpfs-debian-bullseye + - zuul-jobs-test-ensure-zookeeper-tmpfs-ubuntu-focal + - zuul-jobs-test-ensure-zookeeper-tmpfs-ubuntu-jammy + - zuul-jobs-test-ensure-zookeeper-tmpfs-ubuntu-noble + - zuul-jobs-test-ensure-zookeeper-eatmydata-debian-bookworm + - zuul-jobs-test-ensure-zookeeper-eatmydata-debian-bullseye + - zuul-jobs-test-ensure-zookeeper-eatmydata-ubuntu-focal + - zuul-jobs-test-ensure-zookeeper-eatmydata-ubuntu-jammy + - zuul-jobs-test-ensure-zookeeper-eatmydata-ubuntu-noble + - zuul-jobs-test-update-json-file + - zuul-jobs-test-stage-output + - zuul-jobs-test-fetch-translation-output + - zuul-jobs-test-fetch-translation-output-synchronize + - zuul-jobs-test-zuul-tenant-conf-check + - zuul-jobs-test-limit-log-files periodic-weekly: jobs: *id001 diff --git a/zuul-tests.d/haskell.yaml b/zuul-tests.d/haskell.yaml index e410b7784..9d52ade7c 100644 --- a/zuul-tests.d/haskell.yaml +++ b/zuul-tests.d/haskell.yaml @@ -9,10 +9,11 @@ - roles/ensure-ghc/.* - roles/cabal-test/.* pre-run: test-playbooks/haskell/setup-project.yaml + voting: false nodeset: - nodes: - - name: fedora-36 - label: fedora-36 + # This used to run on fedora-36; it needs a new nodeset defined + # and made voting. + nodes: [] - job: name: zuul-jobs-test-haskell-stack-test @@ -24,10 +25,11 @@ - roles/ensure-haskell-stack/.* - roles/haskell-stack-test/.* pre-run: test-playbooks/haskell/setup-stack-project.yaml + voting: false nodeset: - nodes: - - name: fedora-36 - label: fedora-36 + # This used to run on fedora-36; it needs a new nodeset defined + # and made voting. + nodes: [] - job: name: zuul-jobs-test-hlint @@ -41,18 +43,19 @@ pre-run: - playbooks/haskell/pre.yaml - test-playbooks/haskell/setup-project.yaml + voting: false nodeset: - nodes: - - name: fedora-36 - label: fedora-36 + # This used to run on fedora-36; it needs a new nodeset defined + # and made voting. + nodes: [] - project: check: - jobs: &id001 + jobs: - zuul-jobs-test-cabal-test - zuul-jobs-test-haskell-stack-test - zuul-jobs-test-hlint gate: - jobs: *id001 + jobs: &id001 [] periodic-weekly: jobs: *id001