From 62032362e2e4c9ab6995b8e8b60b206fc36cc47b Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Wed, 2 Feb 2022 17:26:23 +0100 Subject: [PATCH] Make CentOS9 jobs voting After mergint [1] we should be able to make all the CS9 jobs voting. [1] https://review.opendev.org/c/zuul/zuul-jobs/+/826603 Change-Id: Ifeb334794d63ece8640d1f6cbd03885d2bbb7c56 --- tools/update-test-platforms.py | 6 ---- zuul-tests.d/python-jobs.yaml | 53 +++++------------------------ zuul-tests.d/python-roles-jobs.yaml | 26 +++----------- 3 files changed, 12 insertions(+), 73 deletions(-) diff --git a/tools/update-test-platforms.py b/tools/update-test-platforms.py index a6ebdddf9..ce2028cf1 100755 --- a/tools/update-test-platforms.py +++ b/tools/update-test-platforms.py @@ -49,12 +49,6 @@ NON_VOTING = [ # Insert a job to make that single job non-voting NON_VOTING_JOBS = [ 'zuul-jobs-test-multinode-roles-gentoo-17-0-systemd', - # amoralej, we need to get https://review.opendev.org/826603 merged for - # other roles to work fine in centos-9-stream - 'zuul-jobs-test-ensure-pip-centos-9-stream', - 'zuul-jobs-test-ensure-tox-centos-9-stream', - 'zuul-jobs-test-build-python-release-jobs-centos-9-stream', - 'zuul-jobs-test-fetch-sphinx-tarball-centos-9-stream', # nimble jobs for centos-7 and opensuse-15 are broken since long time 'zuul-jobs-test-nimble-centos-7', 'zuul-jobs-test-nimble-opensuse-15' diff --git a/zuul-tests.d/python-jobs.yaml b/zuul-tests.d/python-jobs.yaml index a814f9f65..76f4aac04 100644 --- a/zuul-tests.d/python-jobs.yaml +++ b/zuul-tests.d/python-jobs.yaml @@ -31,8 +31,7 @@ label: centos-8-stream - job: - name: zuul-jobs-test-ensure-pip-centos-9-stream-nv - voting: false + name: zuul-jobs-test-ensure-pip-centos-9-stream description: Test the ensure-pip role on centos-9-stream parent: zuul-jobs-test-ensure-pip tags: auto-generated @@ -140,8 +139,7 @@ label: centos-8-stream - job: - name: zuul-jobs-test-ensure-tox-centos-9-stream-nv - voting: false + name: zuul-jobs-test-ensure-tox-centos-9-stream description: Test the ensure-tox role on centos-9-stream parent: zuul-jobs-test-ensure-tox tags: auto-generated @@ -243,8 +241,7 @@ label: centos-8-stream - job: - name: zuul-jobs-test-fetch-sphinx-tarball-centos-9-stream-nv - voting: false + name: zuul-jobs-test-fetch-sphinx-tarball-centos-9-stream description: Test the fetch-sphinx-tarball role on centos-9-stream parent: zuul-jobs-test-fetch-sphinx-tarball tags: auto-generated @@ -417,10 +414,10 @@ - project: check: - jobs: + jobs: &id001 - zuul-jobs-test-ensure-pip-centos-7 - zuul-jobs-test-ensure-pip-centos-8-stream - - zuul-jobs-test-ensure-pip-centos-9-stream-nv + - zuul-jobs-test-ensure-pip-centos-9-stream - zuul-jobs-test-ensure-pip-debian-buster - zuul-jobs-test-ensure-pip-debian-bullseye - zuul-jobs-test-ensure-pip-fedora-35 @@ -430,7 +427,7 @@ - zuul-jobs-test-ensure-sphinx - zuul-jobs-test-ensure-tox-centos-7 - zuul-jobs-test-ensure-tox-centos-8-stream - - zuul-jobs-test-ensure-tox-centos-9-stream-nv + - zuul-jobs-test-ensure-tox-centos-9-stream - zuul-jobs-test-ensure-tox-debian-buster - zuul-jobs-test-ensure-tox-debian-bullseye - zuul-jobs-test-ensure-tox-fedora-35 @@ -439,7 +436,7 @@ - zuul-jobs-test-ensure-tox-ubuntu-focal - zuul-jobs-test-fetch-sphinx-tarball-centos-7 - zuul-jobs-test-fetch-sphinx-tarball-centos-8-stream - - zuul-jobs-test-fetch-sphinx-tarball-centos-9-stream-nv + - zuul-jobs-test-fetch-sphinx-tarball-centos-9-stream - zuul-jobs-test-fetch-sphinx-tarball-debian-buster - zuul-jobs-test-fetch-sphinx-tarball-debian-bullseye - zuul-jobs-test-fetch-sphinx-tarball-fedora-35 @@ -456,40 +453,6 @@ - zuul-jobs-test-fetch-sphinx-tarball-with-zuul-output - zuul-jobs-test-fetch-sphinx-tarball-synchronize gate: - jobs: &id001 - - zuul-jobs-test-ensure-pip-centos-7 - - zuul-jobs-test-ensure-pip-centos-8-stream - - zuul-jobs-test-ensure-pip-debian-buster - - zuul-jobs-test-ensure-pip-debian-bullseye - - zuul-jobs-test-ensure-pip-fedora-35 - - zuul-jobs-test-ensure-pip-opensuse-15 - - zuul-jobs-test-ensure-pip-ubuntu-bionic - - zuul-jobs-test-ensure-pip-ubuntu-focal - - zuul-jobs-test-ensure-sphinx - - zuul-jobs-test-ensure-tox-centos-7 - - zuul-jobs-test-ensure-tox-centos-8-stream - - zuul-jobs-test-ensure-tox-debian-buster - - zuul-jobs-test-ensure-tox-debian-bullseye - - zuul-jobs-test-ensure-tox-fedora-35 - - zuul-jobs-test-ensure-tox-opensuse-15 - - zuul-jobs-test-ensure-tox-ubuntu-bionic - - zuul-jobs-test-ensure-tox-ubuntu-focal - - zuul-jobs-test-fetch-sphinx-tarball-centos-7 - - zuul-jobs-test-fetch-sphinx-tarball-centos-8-stream - - zuul-jobs-test-fetch-sphinx-tarball-debian-buster - - zuul-jobs-test-fetch-sphinx-tarball-debian-bullseye - - zuul-jobs-test-fetch-sphinx-tarball-fedora-35 - - zuul-jobs-test-fetch-sphinx-tarball-opensuse-15 - - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-bionic - - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-focal - - zuul-jobs-test-tox - - zuul-jobs-test-fetch-tox-output - - zuul-jobs-test-fetch-tox-output-synchronize - - zuul-jobs-test-fetch-subunit-output - - zuul-jobs-test-fetch-subunit-output-synchronize - - zuul-jobs-test-fetch-sphinx-output - - zuul-jobs-test-fetch-sphinx-output-synchronize - - zuul-jobs-test-fetch-sphinx-tarball-with-zuul-output - - zuul-jobs-test-fetch-sphinx-tarball-synchronize + jobs: *id001 periodic-weekly: jobs: *id001 diff --git a/zuul-tests.d/python-roles-jobs.yaml b/zuul-tests.d/python-roles-jobs.yaml index 920ae0a2e..1659cdbd2 100644 --- a/zuul-tests.d/python-roles-jobs.yaml +++ b/zuul-tests.d/python-roles-jobs.yaml @@ -33,8 +33,7 @@ label: centos-8-stream - job: - name: zuul-jobs-test-build-python-release-jobs-centos-9-stream-nv - voting: false + name: zuul-jobs-test-build-python-release-jobs-centos-9-stream description: Test the build-python-release-jobs role on centos-9-stream parent: zuul-jobs-test-build-python-release-jobs tags: auto-generated @@ -204,10 +203,10 @@ - project: check: - jobs: + jobs: &id001 - zuul-jobs-test-build-python-release-jobs-centos-7 - zuul-jobs-test-build-python-release-jobs-centos-8-stream - - zuul-jobs-test-build-python-release-jobs-centos-9-stream-nv + - zuul-jobs-test-build-python-release-jobs-centos-9-stream - zuul-jobs-test-build-python-release-jobs-debian-buster - zuul-jobs-test-build-python-release-jobs-debian-bullseye - zuul-jobs-test-build-python-release-jobs-fedora-35 @@ -224,23 +223,6 @@ - zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic - zuul-jobs-test-ensure-python-pyenv-ubuntu-focal gate: - jobs: &id001 - - zuul-jobs-test-build-python-release-jobs-centos-7 - - zuul-jobs-test-build-python-release-jobs-centos-8-stream - - zuul-jobs-test-build-python-release-jobs-debian-buster - - zuul-jobs-test-build-python-release-jobs-debian-bullseye - - zuul-jobs-test-build-python-release-jobs-fedora-35 - - zuul-jobs-test-build-python-release-jobs-opensuse-15 - - zuul-jobs-test-build-python-release-jobs-ubuntu-bionic - - zuul-jobs-test-build-python-release-jobs-ubuntu-focal - - zuul-jobs-test-ensure-python-pyenv-centos-7 - - zuul-jobs-test-ensure-python-pyenv-centos-8-stream - - zuul-jobs-test-ensure-python-pyenv-centos-9-stream - - zuul-jobs-test-ensure-python-pyenv-debian-buster - - zuul-jobs-test-ensure-python-pyenv-debian-bullseye - - zuul-jobs-test-ensure-python-pyenv-fedora-35 - - zuul-jobs-test-ensure-python-pyenv-opensuse-15 - - zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic - - zuul-jobs-test-ensure-python-pyenv-ubuntu-focal + jobs: *id001 periodic-weekly: jobs: *id001