From d46c946f9bc10df1cf4f180c040fd3589a7c9777 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 14 Apr 2020 10:26:19 +1000 Subject: [PATCH] Make ubuntu-plain jobs voting We have enough infrastructure in place now to have the pip-and-virtualenv free node type voting, while we progress towards making this the default. Change-Id: Ie2677364d8696d5c4f71eefe2054da1b39e8bb35 --- tools/update-test-platforms.py | 1 - zuul-tests.d/general-roles-jobs.yaml | 18 +++++++++--------- zuul-tests.d/go-jobs.yaml | 6 +++--- zuul-tests.d/packer-jobs.yaml | 6 +++--- zuul-tests.d/python-jobs.yaml | 12 ++++++------ zuul-tests.d/python-roles-jobs.yaml | 6 +++--- 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/tools/update-test-platforms.py b/tools/update-test-platforms.py index ea9387ea3..7650082e3 100755 --- a/tools/update-test-platforms.py +++ b/tools/update-test-platforms.py @@ -44,7 +44,6 @@ PLATFORMS = [ # insert a platform from above to make it non-voting NON_VOTING = [ 'opensuse-tumbleweed', - 'ubuntu-bionic-plain', ] diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml index 9fc7b3fde..a94cd7529 100644 --- a/zuul-tests.d/general-roles-jobs.yaml +++ b/zuul-tests.d/general-roles-jobs.yaml @@ -206,8 +206,7 @@ label: ubuntu-bionic - job: - name: zuul-jobs-test-base-roles-ubuntu-bionic-plain-nv - voting: false + name: zuul-jobs-test-base-roles-ubuntu-bionic-plain description: Tests roles in the 'base' job on ubuntu-bionic-plain parent: zuul-jobs-test-base-roles tags: auto-generated @@ -322,8 +321,7 @@ label: ubuntu-bionic - job: - name: zuul-jobs-test-bindep-ubuntu-bionic-plain-nv - voting: false + name: zuul-jobs-test-bindep-ubuntu-bionic-plain description: Test the bindep role on ubuntu-bionic-plain parent: zuul-jobs-test-bindep tags: auto-generated @@ -553,8 +551,7 @@ - secondary - job: - name: zuul-jobs-test-multinode-roles-ubuntu-bionic-plain-nv - voting: false + name: zuul-jobs-test-multinode-roles-ubuntu-bionic-plain description: Tests multinode setup roles on ubuntu-bionic-plain parent: zuul-jobs-test-multinode-roles tags: auto-generated @@ -626,7 +623,7 @@ - zuul-jobs-test-base-roles-opensuse-15 - zuul-jobs-test-base-roles-opensuse-tumbleweed-nv - zuul-jobs-test-base-roles-ubuntu-bionic - - zuul-jobs-test-base-roles-ubuntu-bionic-plain-nv + - zuul-jobs-test-base-roles-ubuntu-bionic-plain - zuul-jobs-test-base-roles-ubuntu-xenial - zuul-jobs-test-bindep-centos-7 - zuul-jobs-test-bindep-centos-8 @@ -636,7 +633,7 @@ - zuul-jobs-test-bindep-opensuse-15 - zuul-jobs-test-bindep-opensuse-tumbleweed-nv - zuul-jobs-test-bindep-ubuntu-bionic - - zuul-jobs-test-bindep-ubuntu-bionic-plain-nv + - zuul-jobs-test-bindep-ubuntu-bionic-plain - zuul-jobs-test-bindep-ubuntu-xenial - zuul-jobs-test-clear-firewall - zuul-jobs-test-ensure-bazelisk @@ -650,7 +647,7 @@ - zuul-jobs-test-multinode-roles-opensuse-15 - zuul-jobs-test-multinode-roles-opensuse-tumbleweed-nv - zuul-jobs-test-multinode-roles-ubuntu-bionic - - zuul-jobs-test-multinode-roles-ubuntu-bionic-plain-nv + - zuul-jobs-test-multinode-roles-ubuntu-bionic-plain - zuul-jobs-test-multinode-roles-ubuntu-xenial - zuul-jobs-test-generate-zuul-manifest - zuul-jobs-test-upload-git-mirror @@ -666,6 +663,7 @@ - zuul-jobs-test-base-roles-gentoo-17-0-systemd - zuul-jobs-test-base-roles-opensuse-15 - zuul-jobs-test-base-roles-ubuntu-bionic + - zuul-jobs-test-base-roles-ubuntu-bionic-plain - zuul-jobs-test-base-roles-ubuntu-xenial - zuul-jobs-test-bindep-centos-7 - zuul-jobs-test-bindep-centos-8 @@ -674,6 +672,7 @@ - zuul-jobs-test-bindep-gentoo-17-0-systemd - zuul-jobs-test-bindep-opensuse-15 - zuul-jobs-test-bindep-ubuntu-bionic + - zuul-jobs-test-bindep-ubuntu-bionic-plain - zuul-jobs-test-bindep-ubuntu-xenial - zuul-jobs-test-clear-firewall - zuul-jobs-test-ensure-bazelisk @@ -686,6 +685,7 @@ - zuul-jobs-test-multinode-roles-gentoo-17-0-systemd - zuul-jobs-test-multinode-roles-opensuse-15 - zuul-jobs-test-multinode-roles-ubuntu-bionic + - zuul-jobs-test-multinode-roles-ubuntu-bionic-plain - zuul-jobs-test-multinode-roles-ubuntu-xenial - zuul-jobs-test-generate-zuul-manifest - zuul-jobs-test-upload-git-mirror diff --git a/zuul-tests.d/go-jobs.yaml b/zuul-tests.d/go-jobs.yaml index 2deaf4cb0..7a1b0bc86 100644 --- a/zuul-tests.d/go-jobs.yaml +++ b/zuul-tests.d/go-jobs.yaml @@ -98,8 +98,7 @@ label: ubuntu-bionic - job: - name: zuul-jobs-test-golang-go-ubuntu-bionic-plain-nv - voting: false + name: zuul-jobs-test-golang-go-ubuntu-bionic-plain description: Test the golang-go job on ubuntu-bionic-plain parent: zuul-jobs-test-golang-go tags: auto-generated @@ -129,7 +128,7 @@ - zuul-jobs-test-golang-go-opensuse-15 - zuul-jobs-test-golang-go-opensuse-tumbleweed-nv - zuul-jobs-test-golang-go-ubuntu-bionic - - zuul-jobs-test-golang-go-ubuntu-bionic-plain-nv + - zuul-jobs-test-golang-go-ubuntu-bionic-plain - zuul-jobs-test-golang-go-ubuntu-xenial gate: jobs: @@ -140,4 +139,5 @@ - zuul-jobs-test-golang-go-gentoo-17-0-systemd - zuul-jobs-test-golang-go-opensuse-15 - zuul-jobs-test-golang-go-ubuntu-bionic + - zuul-jobs-test-golang-go-ubuntu-bionic-plain - zuul-jobs-test-golang-go-ubuntu-xenial diff --git a/zuul-tests.d/packer-jobs.yaml b/zuul-tests.d/packer-jobs.yaml index b464d05f4..cb5b9142f 100644 --- a/zuul-tests.d/packer-jobs.yaml +++ b/zuul-tests.d/packer-jobs.yaml @@ -99,8 +99,7 @@ label: ubuntu-bionic - job: - name: test-packer-ubuntu-bionic-plain-nv - voting: false + name: test-packer-ubuntu-bionic-plain description: Test packer job on ubuntu-bionic-plain parent: test-packer tags: auto-generated @@ -130,7 +129,7 @@ - test-packer-opensuse-15 - test-packer-opensuse-tumbleweed-nv - test-packer-ubuntu-bionic - - test-packer-ubuntu-bionic-plain-nv + - test-packer-ubuntu-bionic-plain - test-packer-ubuntu-xenial gate: jobs: @@ -141,4 +140,5 @@ - test-packer-gentoo-17-0-systemd - test-packer-opensuse-15 - test-packer-ubuntu-bionic + - test-packer-ubuntu-bionic-plain - test-packer-ubuntu-xenial diff --git a/zuul-tests.d/python-jobs.yaml b/zuul-tests.d/python-jobs.yaml index 42ab1a49d..f975ef7ac 100644 --- a/zuul-tests.d/python-jobs.yaml +++ b/zuul-tests.d/python-jobs.yaml @@ -88,8 +88,7 @@ label: ubuntu-bionic - job: - name: zuul-jobs-test-ensure-pip-ubuntu-bionic-plain-nv - voting: false + name: zuul-jobs-test-ensure-pip-ubuntu-bionic-plain description: Test the ensure-pip role on ubuntu-bionic-plain parent: zuul-jobs-test-ensure-pip tags: auto-generated @@ -208,8 +207,7 @@ label: ubuntu-bionic - job: - name: zuul-jobs-test-ensure-tox-ubuntu-bionic-plain-nv - voting: false + name: zuul-jobs-test-ensure-tox-ubuntu-bionic-plain description: Test the ensure-tox role on ubuntu-bionic-plain parent: zuul-jobs-test-ensure-tox tags: auto-generated @@ -294,7 +292,7 @@ - zuul-jobs-test-ensure-pip-opensuse-15 - zuul-jobs-test-ensure-pip-opensuse-tumbleweed-nv - zuul-jobs-test-ensure-pip-ubuntu-bionic - - zuul-jobs-test-ensure-pip-ubuntu-bionic-plain-nv + - zuul-jobs-test-ensure-pip-ubuntu-bionic-plain - zuul-jobs-test-ensure-pip-ubuntu-xenial - zuul-jobs-test-ensure-sphinx - zuul-jobs-test-ensure-tox-centos-7 @@ -305,7 +303,7 @@ - zuul-jobs-test-ensure-tox-opensuse-15 - zuul-jobs-test-ensure-tox-opensuse-tumbleweed-nv - zuul-jobs-test-ensure-tox-ubuntu-bionic - - zuul-jobs-test-ensure-tox-ubuntu-bionic-plain-nv + - zuul-jobs-test-ensure-tox-ubuntu-bionic-plain - zuul-jobs-test-ensure-tox-ubuntu-xenial - zuul-jobs-test-tox-siblings - zuul-jobs-test-fetch-tox-output @@ -321,6 +319,7 @@ - zuul-jobs-test-ensure-pip-gentoo-17-0-systemd - zuul-jobs-test-ensure-pip-opensuse-15 - zuul-jobs-test-ensure-pip-ubuntu-bionic + - zuul-jobs-test-ensure-pip-ubuntu-bionic-plain - zuul-jobs-test-ensure-pip-ubuntu-xenial - zuul-jobs-test-ensure-sphinx - zuul-jobs-test-ensure-tox-centos-7 @@ -330,6 +329,7 @@ - zuul-jobs-test-ensure-tox-gentoo-17-0-systemd - zuul-jobs-test-ensure-tox-opensuse-15 - zuul-jobs-test-ensure-tox-ubuntu-bionic + - zuul-jobs-test-ensure-tox-ubuntu-bionic-plain - zuul-jobs-test-ensure-tox-ubuntu-xenial - zuul-jobs-test-tox-siblings - zuul-jobs-test-fetch-tox-output diff --git a/zuul-tests.d/python-roles-jobs.yaml b/zuul-tests.d/python-roles-jobs.yaml index a4a992455..c978dfa2a 100644 --- a/zuul-tests.d/python-roles-jobs.yaml +++ b/zuul-tests.d/python-roles-jobs.yaml @@ -88,8 +88,7 @@ label: ubuntu-bionic - job: - name: zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic-plain-nv - voting: false + name: zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic-plain description: Test the ensure-python role with pyenv on ubuntu-bionic-plain parent: zuul-jobs-test-ensure-python-pyenv tags: auto-generated @@ -119,7 +118,7 @@ - zuul-jobs-test-ensure-python-pyenv-opensuse-15 - zuul-jobs-test-ensure-python-pyenv-opensuse-tumbleweed-nv - zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic - - zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic-plain-nv + - zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic-plain - zuul-jobs-test-ensure-python-pyenv-ubuntu-xenial gate: jobs: @@ -130,4 +129,5 @@ - zuul-jobs-test-ensure-python-pyenv-gentoo-17-0-systemd - zuul-jobs-test-ensure-python-pyenv-opensuse-15 - zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic + - zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic-plain - zuul-jobs-test-ensure-python-pyenv-ubuntu-xenial