From 42755b69c82b771a9309ef4c918eaeb64381f503 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 6 Apr 2020 14:07:17 +1000 Subject: [PATCH] Add bionic-plain non-voting testing This is a temporary node type that does not install "pip-and-virtualenv" so does not have pip or virtualenv pre-installed. Add this for non-voting testing as we migrate to this node type. Change-Id: Ia9006873470d76d29cc9229f11650981662b2de9 Story: #2007386 Task: #39306 --- tools/update-test-platforms.py | 2 ++ zuul-tests.d/general-roles-jobs.yaml | 45 ++++++++++++++++++++++++++++ zuul-tests.d/go-jobs.yaml | 12 ++++++++ zuul-tests.d/python-jobs.yaml | 12 ++++++++ zuul-tests.d/python-roles-jobs.yaml | 12 ++++++++ 5 files changed, 83 insertions(+) diff --git a/tools/update-test-platforms.py b/tools/update-test-platforms.py index db0606372..ea64b7f3f 100755 --- a/tools/update-test-platforms.py +++ b/tools/update-test-platforms.py @@ -37,12 +37,14 @@ PLATFORMS = [ 'opensuse-15', 'opensuse-tumbleweed', 'ubuntu-bionic', + 'ubuntu-bionic-plain', 'ubuntu-xenial', ] # 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 44699d03a..285545f15 100644 --- a/zuul-tests.d/general-roles-jobs.yaml +++ b/zuul-tests.d/general-roles-jobs.yaml @@ -205,6 +205,17 @@ - name: ubuntu-bionic label: ubuntu-bionic +- job: + name: zuul-jobs-test-base-roles-ubuntu-bionic-plain-nv + voting: false + description: Tests roles in the 'base' job on ubuntu-bionic-plain + parent: zuul-jobs-test-base-roles + tags: auto-generated + nodeset: + nodes: + - name: ubuntu-bionic-plain + label: ubuntu-bionic-plain + - job: name: zuul-jobs-test-base-roles-ubuntu-xenial description: Tests roles in the 'base' job on ubuntu-xenial @@ -310,6 +321,17 @@ - name: ubuntu-bionic label: ubuntu-bionic +- job: + name: zuul-jobs-test-bindep-ubuntu-bionic-plain-nv + voting: false + description: Test the bindep role on ubuntu-bionic-plain + parent: zuul-jobs-test-bindep + tags: auto-generated + nodeset: + nodes: + - name: ubuntu-bionic-plain + label: ubuntu-bionic-plain + - job: name: zuul-jobs-test-bindep-ubuntu-xenial description: Test the bindep role on ubuntu-xenial @@ -530,6 +552,26 @@ nodes: - secondary +- job: + name: zuul-jobs-test-multinode-roles-ubuntu-bionic-plain-nv + voting: false + description: Tests multinode setup roles on ubuntu-bionic-plain + parent: zuul-jobs-test-multinode-roles + tags: auto-generated + nodeset: + nodes: + - name: primary + label: ubuntu-bionic-plain + - name: secondary + label: ubuntu-bionic-plain + groups: + - name: switch + nodes: + - primary + - name: peers + nodes: + - secondary + - job: name: zuul-jobs-test-multinode-roles-ubuntu-xenial description: Tests multinode setup roles on ubuntu-xenial @@ -584,6 +626,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-xenial - zuul-jobs-test-bindep-centos-7 - zuul-jobs-test-bindep-centos-8 @@ -593,6 +636,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-xenial - zuul-jobs-test-clear-firewall - zuul-jobs-test-ensure-bazelisk @@ -606,6 +650,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-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 fc7974c33..2f64eb3bf 100644 --- a/zuul-tests.d/go-jobs.yaml +++ b/zuul-tests.d/go-jobs.yaml @@ -97,6 +97,17 @@ - name: ubuntu-bionic label: ubuntu-bionic +- job: + name: zuul-jobs-test-golang-go-ubuntu-bionic-plain-nv + voting: false + description: Test the golang-go job on ubuntu-bionic-plain + parent: zuul-jobs-test-golang-go + tags: auto-generated + nodeset: + nodes: + - name: ubuntu-bionic-plain + label: ubuntu-bionic-plain + - job: name: zuul-jobs-test-golang-go-ubuntu-xenial description: Test the golang-go job on ubuntu-xenial @@ -118,6 +129,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-xenial gate: jobs: diff --git a/zuul-tests.d/python-jobs.yaml b/zuul-tests.d/python-jobs.yaml index 1176eb65b..2c8f21b83 100644 --- a/zuul-tests.d/python-jobs.yaml +++ b/zuul-tests.d/python-jobs.yaml @@ -97,6 +97,17 @@ - name: ubuntu-bionic label: ubuntu-bionic +- job: + name: zuul-jobs-test-ensure-tox-ubuntu-bionic-plain-nv + voting: false + description: Test the ensure-tox role on ubuntu-bionic-plain + parent: zuul-jobs-test-ensure-tox + tags: auto-generated + nodeset: + nodes: + - name: ubuntu-bionic-plain + label: ubuntu-bionic-plain + - job: name: zuul-jobs-test-ensure-tox-ubuntu-xenial description: Test the ensure-tox role on ubuntu-xenial @@ -174,6 +185,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-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 13e43c450..47a4d61b5 100644 --- a/zuul-tests.d/python-roles-jobs.yaml +++ b/zuul-tests.d/python-roles-jobs.yaml @@ -87,6 +87,17 @@ - name: ubuntu-bionic label: ubuntu-bionic +- job: + name: zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic-plain-nv + voting: false + description: Test the ensure-python role with pyenv on ubuntu-bionic-plain + parent: zuul-jobs-test-ensure-python-pyenv + tags: auto-generated + nodeset: + nodes: + - name: ubuntu-bionic-plain + label: ubuntu-bionic-plain + - job: name: zuul-jobs-test-ensure-python-pyenv-ubuntu-xenial description: Test the ensure-python role with pyenv on ubuntu-xenial @@ -108,6 +119,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-xenial gate: jobs: