From 8733cff8db882221e8cb26ea362724bdb488b24c Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Fri, 1 May 2020 09:14:30 +1000
Subject: [PATCH] Add plain nodes to testing

This adds more of the plain nodes (without pip-and-virtualenv) to our
testing environment to facilitate the eventual switch in opendev
infra.

Change-Id: I091ab667c5f071ba5844ea567464b1c29052638d
---
 tools/update-test-platforms.py       |   5 +-
 zuul-tests.d/general-roles-jobs.yaml | 171 ++++++++++++++++++++++++---
 zuul-tests.d/go-jobs.yaml            |  48 +++++++-
 zuul-tests.d/packer-jobs.yaml        |  48 +++++++-
 zuul-tests.d/python-jobs.yaml        | 144 +++++++++++++++++++---
 zuul-tests.d/python-roles-jobs.yaml  |  48 +++++++-
 6 files changed, 409 insertions(+), 55 deletions(-)

diff --git a/tools/update-test-platforms.py b/tools/update-test-platforms.py
index 7650082e3..147ca92e0 100755
--- a/tools/update-test-platforms.py
+++ b/tools/update-test-platforms.py
@@ -37,8 +37,11 @@ PLATFORMS = [
     'opensuse-15',
     'opensuse-tumbleweed',
     'ubuntu-bionic',
-    'ubuntu-bionic-plain',
     'ubuntu-xenial',
+    'ubuntu-bionic-plain',
+    'ubuntu-xenial-plain',
+    'centos-8-plain',
+    'opensuse-15-plain',
 ]
 
 # insert a platform from above to make it non-voting
diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml
index a94cd7529..86b3b6287 100644
--- a/zuul-tests.d/general-roles-jobs.yaml
+++ b/zuul-tests.d/general-roles-jobs.yaml
@@ -205,6 +205,16 @@
         - name: ubuntu-bionic
           label: ubuntu-bionic
 
+- 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
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: ubuntu-xenial
+          label: ubuntu-xenial
+
 - job:
     name: zuul-jobs-test-base-roles-ubuntu-bionic-plain
     description: Tests roles in the 'base' job on ubuntu-bionic-plain
@@ -216,14 +226,34 @@
           label: ubuntu-bionic-plain
 
 - job:
-    name: zuul-jobs-test-base-roles-ubuntu-xenial
-    description: Tests roles in the 'base' job on ubuntu-xenial
+    name: zuul-jobs-test-base-roles-ubuntu-xenial-plain
+    description: Tests roles in the 'base' job on ubuntu-xenial-plain
     parent: zuul-jobs-test-base-roles
     tags: auto-generated
     nodeset:
       nodes:
-        - name: ubuntu-xenial
-          label: ubuntu-xenial
+        - name: ubuntu-xenial-plain
+          label: ubuntu-xenial-plain
+
+- job:
+    name: zuul-jobs-test-base-roles-centos-8-plain
+    description: Tests roles in the 'base' job on centos-8-plain
+    parent: zuul-jobs-test-base-roles
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: centos-8-plain
+          label: centos-8-plain
+
+- job:
+    name: zuul-jobs-test-base-roles-opensuse-15-plain
+    description: Tests roles in the 'base' job on opensuse-15-plain
+    parent: zuul-jobs-test-base-roles
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: opensuse-15-plain
+          label: opensuse-15-plain
 
 - job:
     name: zuul-jobs-test-bindep
@@ -320,6 +350,16 @@
         - name: ubuntu-bionic
           label: ubuntu-bionic
 
+- job:
+    name: zuul-jobs-test-bindep-ubuntu-xenial
+    description: Test the bindep role on ubuntu-xenial
+    parent: zuul-jobs-test-bindep
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: ubuntu-xenial
+          label: ubuntu-xenial
+
 - job:
     name: zuul-jobs-test-bindep-ubuntu-bionic-plain
     description: Test the bindep role on ubuntu-bionic-plain
@@ -331,14 +371,34 @@
           label: ubuntu-bionic-plain
 
 - job:
-    name: zuul-jobs-test-bindep-ubuntu-xenial
-    description: Test the bindep role on ubuntu-xenial
+    name: zuul-jobs-test-bindep-ubuntu-xenial-plain
+    description: Test the bindep role on ubuntu-xenial-plain
     parent: zuul-jobs-test-bindep
     tags: auto-generated
     nodeset:
       nodes:
-        - name: ubuntu-xenial
-          label: ubuntu-xenial
+        - name: ubuntu-xenial-plain
+          label: ubuntu-xenial-plain
+
+- job:
+    name: zuul-jobs-test-bindep-centos-8-plain
+    description: Test the bindep role on centos-8-plain
+    parent: zuul-jobs-test-bindep
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: centos-8-plain
+          label: centos-8-plain
+
+- job:
+    name: zuul-jobs-test-bindep-opensuse-15-plain
+    description: Test the bindep role on opensuse-15-plain
+    parent: zuul-jobs-test-bindep
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: opensuse-15-plain
+          label: opensuse-15-plain
 
 - job:
     name: zuul-jobs-test-clear-firewall
@@ -550,6 +610,25 @@
           nodes:
             - secondary
 
+- job:
+    name: zuul-jobs-test-multinode-roles-ubuntu-xenial
+    description: Tests multinode setup roles on ubuntu-xenial
+    parent: zuul-jobs-test-multinode-roles
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: primary
+          label: ubuntu-xenial
+        - name: secondary
+          label: ubuntu-xenial
+      groups:
+        - name: switch
+          nodes:
+            - primary
+        - name: peers
+          nodes:
+            - secondary
+
 - job:
     name: zuul-jobs-test-multinode-roles-ubuntu-bionic-plain
     description: Tests multinode setup roles on ubuntu-bionic-plain
@@ -570,16 +649,54 @@
             - secondary
 
 - job:
-    name: zuul-jobs-test-multinode-roles-ubuntu-xenial
-    description: Tests multinode setup roles on ubuntu-xenial
+    name: zuul-jobs-test-multinode-roles-ubuntu-xenial-plain
+    description: Tests multinode setup roles on ubuntu-xenial-plain
     parent: zuul-jobs-test-multinode-roles
     tags: auto-generated
     nodeset:
       nodes:
         - name: primary
-          label: ubuntu-xenial
+          label: ubuntu-xenial-plain
         - name: secondary
-          label: ubuntu-xenial
+          label: ubuntu-xenial-plain
+      groups:
+        - name: switch
+          nodes:
+            - primary
+        - name: peers
+          nodes:
+            - secondary
+
+- job:
+    name: zuul-jobs-test-multinode-roles-centos-8-plain
+    description: Tests multinode setup roles on centos-8-plain
+    parent: zuul-jobs-test-multinode-roles
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: primary
+          label: centos-8-plain
+        - name: secondary
+          label: centos-8-plain
+      groups:
+        - name: switch
+          nodes:
+            - primary
+        - name: peers
+          nodes:
+            - secondary
+
+- job:
+    name: zuul-jobs-test-multinode-roles-opensuse-15-plain
+    description: Tests multinode setup roles on opensuse-15-plain
+    parent: zuul-jobs-test-multinode-roles
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: primary
+          label: opensuse-15-plain
+        - name: secondary
+          label: opensuse-15-plain
       groups:
         - name: switch
           nodes:
@@ -623,8 +740,11 @@
         - 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
         - zuul-jobs-test-base-roles-ubuntu-xenial
+        - zuul-jobs-test-base-roles-ubuntu-bionic-plain
+        - zuul-jobs-test-base-roles-ubuntu-xenial-plain
+        - zuul-jobs-test-base-roles-centos-8-plain
+        - zuul-jobs-test-base-roles-opensuse-15-plain
         - zuul-jobs-test-bindep-centos-7
         - zuul-jobs-test-bindep-centos-8
         - zuul-jobs-test-bindep-debian-stretch
@@ -633,8 +753,11 @@
         - 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
         - zuul-jobs-test-bindep-ubuntu-xenial
+        - zuul-jobs-test-bindep-ubuntu-bionic-plain
+        - zuul-jobs-test-bindep-ubuntu-xenial-plain
+        - zuul-jobs-test-bindep-centos-8-plain
+        - zuul-jobs-test-bindep-opensuse-15-plain
         - zuul-jobs-test-clear-firewall
         - zuul-jobs-test-ensure-bazelisk
         - zuul-jobs-test-netconsole
@@ -647,8 +770,11 @@
         - 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
         - zuul-jobs-test-multinode-roles-ubuntu-xenial
+        - zuul-jobs-test-multinode-roles-ubuntu-bionic-plain
+        - zuul-jobs-test-multinode-roles-ubuntu-xenial-plain
+        - zuul-jobs-test-multinode-roles-centos-8-plain
+        - zuul-jobs-test-multinode-roles-opensuse-15-plain
         - zuul-jobs-test-generate-zuul-manifest
         - zuul-jobs-test-upload-git-mirror
     gate:
@@ -663,8 +789,11 @@
         - 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-base-roles-ubuntu-bionic-plain
+        - zuul-jobs-test-base-roles-ubuntu-xenial-plain
+        - zuul-jobs-test-base-roles-centos-8-plain
+        - zuul-jobs-test-base-roles-opensuse-15-plain
         - zuul-jobs-test-bindep-centos-7
         - zuul-jobs-test-bindep-centos-8
         - zuul-jobs-test-bindep-debian-stretch
@@ -672,8 +801,11 @@
         - 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-bindep-ubuntu-bionic-plain
+        - zuul-jobs-test-bindep-ubuntu-xenial-plain
+        - zuul-jobs-test-bindep-centos-8-plain
+        - zuul-jobs-test-bindep-opensuse-15-plain
         - zuul-jobs-test-clear-firewall
         - zuul-jobs-test-ensure-bazelisk
         - zuul-jobs-test-netconsole
@@ -685,7 +817,10 @@
         - 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-multinode-roles-ubuntu-bionic-plain
+        - zuul-jobs-test-multinode-roles-ubuntu-xenial-plain
+        - zuul-jobs-test-multinode-roles-centos-8-plain
+        - zuul-jobs-test-multinode-roles-opensuse-15-plain
         - 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 7a1b0bc86..6d73eb59b 100644
--- a/zuul-tests.d/go-jobs.yaml
+++ b/zuul-tests.d/go-jobs.yaml
@@ -97,6 +97,16 @@
         - name: ubuntu-bionic
           label: ubuntu-bionic
 
+- job:
+    name: zuul-jobs-test-golang-go-ubuntu-xenial
+    description: Test the golang-go job on ubuntu-xenial
+    parent: zuul-jobs-test-golang-go
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: ubuntu-xenial
+          label: ubuntu-xenial
+
 - job:
     name: zuul-jobs-test-golang-go-ubuntu-bionic-plain
     description: Test the golang-go job on ubuntu-bionic-plain
@@ -108,14 +118,34 @@
           label: ubuntu-bionic-plain
 
 - job:
-    name: zuul-jobs-test-golang-go-ubuntu-xenial
-    description: Test the golang-go job on ubuntu-xenial
+    name: zuul-jobs-test-golang-go-ubuntu-xenial-plain
+    description: Test the golang-go job on ubuntu-xenial-plain
     parent: zuul-jobs-test-golang-go
     tags: auto-generated
     nodeset:
       nodes:
-        - name: ubuntu-xenial
-          label: ubuntu-xenial
+        - name: ubuntu-xenial-plain
+          label: ubuntu-xenial-plain
+
+- job:
+    name: zuul-jobs-test-golang-go-centos-8-plain
+    description: Test the golang-go job on centos-8-plain
+    parent: zuul-jobs-test-golang-go
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: centos-8-plain
+          label: centos-8-plain
+
+- job:
+    name: zuul-jobs-test-golang-go-opensuse-15-plain
+    description: Test the golang-go job on opensuse-15-plain
+    parent: zuul-jobs-test-golang-go
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: opensuse-15-plain
+          label: opensuse-15-plain
 
 - project:
     check:
@@ -128,8 +158,11 @@
         - 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
         - zuul-jobs-test-golang-go-ubuntu-xenial
+        - zuul-jobs-test-golang-go-ubuntu-bionic-plain
+        - zuul-jobs-test-golang-go-ubuntu-xenial-plain
+        - zuul-jobs-test-golang-go-centos-8-plain
+        - zuul-jobs-test-golang-go-opensuse-15-plain
     gate:
       jobs:
         - zuul-jobs-test-golang-go-centos-7
@@ -139,5 +172,8 @@
         - 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
+        - zuul-jobs-test-golang-go-ubuntu-bionic-plain
+        - zuul-jobs-test-golang-go-ubuntu-xenial-plain
+        - zuul-jobs-test-golang-go-centos-8-plain
+        - zuul-jobs-test-golang-go-opensuse-15-plain
diff --git a/zuul-tests.d/packer-jobs.yaml b/zuul-tests.d/packer-jobs.yaml
index cb5b9142f..300c49290 100644
--- a/zuul-tests.d/packer-jobs.yaml
+++ b/zuul-tests.d/packer-jobs.yaml
@@ -98,6 +98,16 @@
         - name: ubuntu-bionic
           label: ubuntu-bionic
 
+- job:
+    name: test-packer-ubuntu-xenial
+    description: Test packer job on ubuntu-xenial
+    parent: test-packer
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: ubuntu-xenial
+          label: ubuntu-xenial
+
 - job:
     name: test-packer-ubuntu-bionic-plain
     description: Test packer job on ubuntu-bionic-plain
@@ -109,14 +119,34 @@
           label: ubuntu-bionic-plain
 
 - job:
-    name: test-packer-ubuntu-xenial
-    description: Test packer job on ubuntu-xenial
+    name: test-packer-ubuntu-xenial-plain
+    description: Test packer job on ubuntu-xenial-plain
     parent: test-packer
     tags: auto-generated
     nodeset:
       nodes:
-        - name: ubuntu-xenial
-          label: ubuntu-xenial
+        - name: ubuntu-xenial-plain
+          label: ubuntu-xenial-plain
+
+- job:
+    name: test-packer-centos-8-plain
+    description: Test packer job on centos-8-plain
+    parent: test-packer
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: centos-8-plain
+          label: centos-8-plain
+
+- job:
+    name: test-packer-opensuse-15-plain
+    description: Test packer job on opensuse-15-plain
+    parent: test-packer
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: opensuse-15-plain
+          label: opensuse-15-plain
 
 - project:
     check:
@@ -129,8 +159,11 @@
         - test-packer-opensuse-15
         - test-packer-opensuse-tumbleweed-nv
         - test-packer-ubuntu-bionic
-        - test-packer-ubuntu-bionic-plain
         - test-packer-ubuntu-xenial
+        - test-packer-ubuntu-bionic-plain
+        - test-packer-ubuntu-xenial-plain
+        - test-packer-centos-8-plain
+        - test-packer-opensuse-15-plain
     gate:
       jobs:
         - test-packer-centos-7
@@ -140,5 +173,8 @@
         - test-packer-gentoo-17-0-systemd
         - test-packer-opensuse-15
         - test-packer-ubuntu-bionic
-        - test-packer-ubuntu-bionic-plain
         - test-packer-ubuntu-xenial
+        - test-packer-ubuntu-bionic-plain
+        - test-packer-ubuntu-xenial-plain
+        - test-packer-centos-8-plain
+        - test-packer-opensuse-15-plain
diff --git a/zuul-tests.d/python-jobs.yaml b/zuul-tests.d/python-jobs.yaml
index 79eb4d6eb..c00f011f0 100644
--- a/zuul-tests.d/python-jobs.yaml
+++ b/zuul-tests.d/python-jobs.yaml
@@ -88,6 +88,16 @@
         - name: ubuntu-bionic
           label: ubuntu-bionic
 
+- job:
+    name: zuul-jobs-test-ensure-pip-ubuntu-xenial
+    description: Test the ensure-pip role on ubuntu-xenial
+    parent: zuul-jobs-test-ensure-pip
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: ubuntu-xenial
+          label: ubuntu-xenial
+
 - job:
     name: zuul-jobs-test-ensure-pip-ubuntu-bionic-plain
     description: Test the ensure-pip role on ubuntu-bionic-plain
@@ -99,14 +109,34 @@
           label: ubuntu-bionic-plain
 
 - job:
-    name: zuul-jobs-test-ensure-pip-ubuntu-xenial
-    description: Test the ensure-pip role on ubuntu-xenial
+    name: zuul-jobs-test-ensure-pip-ubuntu-xenial-plain
+    description: Test the ensure-pip role on ubuntu-xenial-plain
     parent: zuul-jobs-test-ensure-pip
     tags: auto-generated
     nodeset:
       nodes:
-        - name: ubuntu-xenial
-          label: ubuntu-xenial
+        - name: ubuntu-xenial-plain
+          label: ubuntu-xenial-plain
+
+- job:
+    name: zuul-jobs-test-ensure-pip-centos-8-plain
+    description: Test the ensure-pip role on centos-8-plain
+    parent: zuul-jobs-test-ensure-pip
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: centos-8-plain
+          label: centos-8-plain
+
+- job:
+    name: zuul-jobs-test-ensure-pip-opensuse-15-plain
+    description: Test the ensure-pip role on opensuse-15-plain
+    parent: zuul-jobs-test-ensure-pip
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: opensuse-15-plain
+          label: opensuse-15-plain
 
 - job:
     name: zuul-jobs-test-ensure-sphinx
@@ -207,6 +237,16 @@
         - name: ubuntu-bionic
           label: ubuntu-bionic
 
+- job:
+    name: zuul-jobs-test-ensure-tox-ubuntu-xenial
+    description: Test the ensure-tox role on ubuntu-xenial
+    parent: zuul-jobs-test-ensure-tox
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: ubuntu-xenial
+          label: ubuntu-xenial
+
 - job:
     name: zuul-jobs-test-ensure-tox-ubuntu-bionic-plain
     description: Test the ensure-tox role on ubuntu-bionic-plain
@@ -218,14 +258,34 @@
           label: ubuntu-bionic-plain
 
 - job:
-    name: zuul-jobs-test-ensure-tox-ubuntu-xenial
-    description: Test the ensure-tox role on ubuntu-xenial
+    name: zuul-jobs-test-ensure-tox-ubuntu-xenial-plain
+    description: Test the ensure-tox role on ubuntu-xenial-plain
     parent: zuul-jobs-test-ensure-tox
     tags: auto-generated
     nodeset:
       nodes:
-        - name: ubuntu-xenial
-          label: ubuntu-xenial
+        - name: ubuntu-xenial-plain
+          label: ubuntu-xenial-plain
+
+- job:
+    name: zuul-jobs-test-ensure-tox-centos-8-plain
+    description: Test the ensure-tox role on centos-8-plain
+    parent: zuul-jobs-test-ensure-tox
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: centos-8-plain
+          label: centos-8-plain
+
+- job:
+    name: zuul-jobs-test-ensure-tox-opensuse-15-plain
+    description: Test the ensure-tox role on opensuse-15-plain
+    parent: zuul-jobs-test-ensure-tox
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: opensuse-15-plain
+          label: opensuse-15-plain
 
 - job:
     name: zuul-jobs-test-fetch-sphinx-tarball
@@ -319,6 +379,16 @@
         - name: ubuntu-bionic
           label: ubuntu-bionic
 
+- job:
+    name: zuul-jobs-test-fetch-sphinx-tarball-ubuntu-xenial
+    description: Test the fetch-sphinx-tarball role on ubuntu-xenial
+    parent: zuul-jobs-test-fetch-sphinx-tarball
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: ubuntu-xenial
+          label: ubuntu-xenial
+
 - job:
     name: zuul-jobs-test-fetch-sphinx-tarball-ubuntu-bionic-plain
     description: Test the fetch-sphinx-tarball role on ubuntu-bionic-plain
@@ -330,14 +400,34 @@
           label: ubuntu-bionic-plain
 
 - job:
-    name: zuul-jobs-test-fetch-sphinx-tarball-ubuntu-xenial
-    description: Test the fetch-sphinx-tarball role on ubuntu-xenial
+    name: zuul-jobs-test-fetch-sphinx-tarball-ubuntu-xenial-plain
+    description: Test the fetch-sphinx-tarball role on ubuntu-xenial-plain
     parent: zuul-jobs-test-fetch-sphinx-tarball
     tags: auto-generated
     nodeset:
       nodes:
-        - name: ubuntu-xenial
-          label: ubuntu-xenial
+        - name: ubuntu-xenial-plain
+          label: ubuntu-xenial-plain
+
+- job:
+    name: zuul-jobs-test-fetch-sphinx-tarball-centos-8-plain
+    description: Test the fetch-sphinx-tarball role on centos-8-plain
+    parent: zuul-jobs-test-fetch-sphinx-tarball
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: centos-8-plain
+          label: centos-8-plain
+
+- job:
+    name: zuul-jobs-test-fetch-sphinx-tarball-opensuse-15-plain
+    description: Test the fetch-sphinx-tarball role on opensuse-15-plain
+    parent: zuul-jobs-test-fetch-sphinx-tarball
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: opensuse-15-plain
+          label: opensuse-15-plain
 
 - job:
     name: zuul-jobs-test-tox-siblings
@@ -409,8 +499,11 @@
         - 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
         - zuul-jobs-test-ensure-pip-ubuntu-xenial
+        - zuul-jobs-test-ensure-pip-ubuntu-bionic-plain
+        - zuul-jobs-test-ensure-pip-ubuntu-xenial-plain
+        - zuul-jobs-test-ensure-pip-centos-8-plain
+        - zuul-jobs-test-ensure-pip-opensuse-15-plain
         - zuul-jobs-test-ensure-sphinx
         - zuul-jobs-test-ensure-tox-centos-7
         - zuul-jobs-test-ensure-tox-centos-8
@@ -420,8 +513,11 @@
         - 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
         - zuul-jobs-test-ensure-tox-ubuntu-xenial
+        - zuul-jobs-test-ensure-tox-ubuntu-bionic-plain
+        - zuul-jobs-test-ensure-tox-ubuntu-xenial-plain
+        - zuul-jobs-test-ensure-tox-centos-8-plain
+        - zuul-jobs-test-ensure-tox-opensuse-15-plain
         - zuul-jobs-test-fetch-sphinx-tarball-centos-7
         - zuul-jobs-test-fetch-sphinx-tarball-centos-8
         - zuul-jobs-test-fetch-sphinx-tarball-debian-stretch
@@ -430,8 +526,11 @@
         - zuul-jobs-test-fetch-sphinx-tarball-opensuse-15
         - zuul-jobs-test-fetch-sphinx-tarball-opensuse-tumbleweed-nv
         - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-bionic
-        - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-bionic-plain
         - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-xenial
+        - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-bionic-plain
+        - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-xenial-plain
+        - zuul-jobs-test-fetch-sphinx-tarball-centos-8-plain
+        - zuul-jobs-test-fetch-sphinx-tarball-opensuse-15-plain
         - zuul-jobs-test-tox-siblings
         - zuul-jobs-test-fetch-tox-output
         - zuul-jobs-test-fetch-tox-output-synchronize
@@ -446,8 +545,11 @@
         - 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-pip-ubuntu-bionic-plain
+        - zuul-jobs-test-ensure-pip-ubuntu-xenial-plain
+        - zuul-jobs-test-ensure-pip-centos-8-plain
+        - zuul-jobs-test-ensure-pip-opensuse-15-plain
         - zuul-jobs-test-ensure-sphinx
         - zuul-jobs-test-ensure-tox-centos-7
         - zuul-jobs-test-ensure-tox-centos-8
@@ -456,8 +558,11 @@
         - 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-ensure-tox-ubuntu-bionic-plain
+        - zuul-jobs-test-ensure-tox-ubuntu-xenial-plain
+        - zuul-jobs-test-ensure-tox-centos-8-plain
+        - zuul-jobs-test-ensure-tox-opensuse-15-plain
         - zuul-jobs-test-fetch-sphinx-tarball-centos-7
         - zuul-jobs-test-fetch-sphinx-tarball-centos-8
         - zuul-jobs-test-fetch-sphinx-tarball-debian-stretch
@@ -465,8 +570,11 @@
         - zuul-jobs-test-fetch-sphinx-tarball-gentoo-17-0-systemd
         - zuul-jobs-test-fetch-sphinx-tarball-opensuse-15
         - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-bionic
-        - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-bionic-plain
         - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-xenial
+        - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-bionic-plain
+        - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-xenial-plain
+        - zuul-jobs-test-fetch-sphinx-tarball-centos-8-plain
+        - zuul-jobs-test-fetch-sphinx-tarball-opensuse-15-plain
         - zuul-jobs-test-tox-siblings
         - zuul-jobs-test-fetch-tox-output
         - zuul-jobs-test-fetch-tox-output-synchronize
diff --git a/zuul-tests.d/python-roles-jobs.yaml b/zuul-tests.d/python-roles-jobs.yaml
index c978dfa2a..55d59132b 100644
--- a/zuul-tests.d/python-roles-jobs.yaml
+++ b/zuul-tests.d/python-roles-jobs.yaml
@@ -87,6 +87,16 @@
         - name: ubuntu-bionic
           label: ubuntu-bionic
 
+- job:
+    name: zuul-jobs-test-ensure-python-pyenv-ubuntu-xenial
+    description: Test the ensure-python role with pyenv on ubuntu-xenial
+    parent: zuul-jobs-test-ensure-python-pyenv
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: ubuntu-xenial
+          label: ubuntu-xenial
+
 - job:
     name: zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic-plain
     description: Test the ensure-python role with pyenv on ubuntu-bionic-plain
@@ -98,14 +108,34 @@
           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
+    name: zuul-jobs-test-ensure-python-pyenv-ubuntu-xenial-plain
+    description: Test the ensure-python role with pyenv on ubuntu-xenial-plain
     parent: zuul-jobs-test-ensure-python-pyenv
     tags: auto-generated
     nodeset:
       nodes:
-        - name: ubuntu-xenial
-          label: ubuntu-xenial
+        - name: ubuntu-xenial-plain
+          label: ubuntu-xenial-plain
+
+- job:
+    name: zuul-jobs-test-ensure-python-pyenv-centos-8-plain
+    description: Test the ensure-python role with pyenv on centos-8-plain
+    parent: zuul-jobs-test-ensure-python-pyenv
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: centos-8-plain
+          label: centos-8-plain
+
+- job:
+    name: zuul-jobs-test-ensure-python-pyenv-opensuse-15-plain
+    description: Test the ensure-python role with pyenv on opensuse-15-plain
+    parent: zuul-jobs-test-ensure-python-pyenv
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: opensuse-15-plain
+          label: opensuse-15-plain
 
 - project:
     check:
@@ -118,8 +148,11 @@
         - 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
         - zuul-jobs-test-ensure-python-pyenv-ubuntu-xenial
+        - zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic-plain
+        - zuul-jobs-test-ensure-python-pyenv-ubuntu-xenial-plain
+        - zuul-jobs-test-ensure-python-pyenv-centos-8-plain
+        - zuul-jobs-test-ensure-python-pyenv-opensuse-15-plain
     gate:
       jobs:
         - zuul-jobs-test-ensure-python-pyenv-centos-7
@@ -129,5 +162,8 @@
         - 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
+        - zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic-plain
+        - zuul-jobs-test-ensure-python-pyenv-ubuntu-xenial-plain
+        - zuul-jobs-test-ensure-python-pyenv-centos-8-plain
+        - zuul-jobs-test-ensure-python-pyenv-opensuse-15-plain