diff --git a/tools/update-test-platforms.py b/tools/update-test-platforms.py
index dda03379d..70cbb95c0 100755
--- a/tools/update-test-platforms.py
+++ b/tools/update-test-platforms.py
@@ -38,9 +38,6 @@ PLATFORMS = [
     'opensuse-tumbleweed',
     'ubuntu-bionic',
     'ubuntu-xenial',
-    'ubuntu-bionic-plain',
-    'ubuntu-xenial-plain',
-    'centos-8-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 c1b15a0df..02505ce4d 100644
--- a/zuul-tests.d/general-roles-jobs.yaml
+++ b/zuul-tests.d/general-roles-jobs.yaml
@@ -215,36 +215,6 @@
         - 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
-    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-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-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-bindep
     description: Test the bindep role
@@ -350,36 +320,6 @@
         - name: ubuntu-xenial
           label: ubuntu-xenial
 
-- job:
-    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
-    nodeset:
-      nodes:
-        - name: ubuntu-bionic-plain
-          label: ubuntu-bionic-plain
-
-- job:
-    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-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-clear-firewall
     description: Test the clear-firewall role
@@ -610,63 +550,6 @@
           nodes:
             - secondary
 
-- job:
-    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
-    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-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-plain
-        - name: secondary
-          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-generate-zuul-manifest
     description: Test the generate-zuul-manifest role
@@ -728,9 +611,6 @@
         - zuul-jobs-test-base-roles-opensuse-tumbleweed-nv
         - zuul-jobs-test-base-roles-ubuntu-bionic
         - 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-bindep-centos-7
         - zuul-jobs-test-bindep-centos-8
         - zuul-jobs-test-bindep-debian-stretch
@@ -740,9 +620,6 @@
         - zuul-jobs-test-bindep-opensuse-tumbleweed-nv
         - zuul-jobs-test-bindep-ubuntu-bionic
         - 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-clear-firewall
         - zuul-jobs-test-ensure-bazelisk
         - zuul-jobs-test-netconsole
@@ -756,9 +633,6 @@
         - zuul-jobs-test-multinode-roles-opensuse-tumbleweed-nv
         - zuul-jobs-test-multinode-roles-ubuntu-bionic
         - 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-generate-zuul-manifest
         - zuul-jobs-test-upload-artifactory
         - zuul-jobs-test-upload-git-mirror
@@ -776,9 +650,6 @@
         - zuul-jobs-test-base-roles-opensuse-15
         - zuul-jobs-test-base-roles-ubuntu-bionic
         - 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-bindep-centos-7
         - zuul-jobs-test-bindep-centos-8
         - zuul-jobs-test-bindep-debian-stretch
@@ -787,9 +658,6 @@
         - zuul-jobs-test-bindep-opensuse-15
         - zuul-jobs-test-bindep-ubuntu-bionic
         - 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-clear-firewall
         - zuul-jobs-test-ensure-bazelisk
         - zuul-jobs-test-netconsole
@@ -801,9 +669,6 @@
         - zuul-jobs-test-multinode-roles-opensuse-15
         - zuul-jobs-test-multinode-roles-ubuntu-bionic
         - 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-generate-zuul-manifest
         - zuul-jobs-test-upload-artifactory
         - zuul-jobs-test-upload-git-mirror
diff --git a/zuul-tests.d/go-jobs.yaml b/zuul-tests.d/go-jobs.yaml
index 27d953de5..93b4189bd 100644
--- a/zuul-tests.d/go-jobs.yaml
+++ b/zuul-tests.d/go-jobs.yaml
@@ -107,36 +107,6 @@
         - 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
-    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-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-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
-
 - project:
     check:
       jobs:
@@ -149,9 +119,6 @@
         - zuul-jobs-test-golang-go-opensuse-tumbleweed-nv
         - zuul-jobs-test-golang-go-ubuntu-bionic
         - 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
     gate:
       jobs:
         - zuul-jobs-test-golang-go-centos-7
@@ -162,6 +129,3 @@
         - zuul-jobs-test-golang-go-opensuse-15
         - zuul-jobs-test-golang-go-ubuntu-bionic
         - 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
diff --git a/zuul-tests.d/packer-jobs.yaml b/zuul-tests.d/packer-jobs.yaml
index a048391cc..da8ae871d 100644
--- a/zuul-tests.d/packer-jobs.yaml
+++ b/zuul-tests.d/packer-jobs.yaml
@@ -109,36 +109,6 @@
         - name: ubuntu-xenial
           label: ubuntu-xenial
 
-- job:
-    name: zuul-jobs-test-packer-ubuntu-bionic-plain
-    description: Test packer job on ubuntu-bionic-plain
-    parent: zuul-jobs-test-packer
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: ubuntu-bionic-plain
-          label: ubuntu-bionic-plain
-
-- job:
-    name: zuul-jobs-test-packer-ubuntu-xenial-plain
-    description: Test packer job on ubuntu-xenial-plain
-    parent: zuul-jobs-test-packer
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: ubuntu-xenial-plain
-          label: ubuntu-xenial-plain
-
-- job:
-    name: zuul-jobs-test-packer-centos-8-plain
-    description: Test packer job on centos-8-plain
-    parent: zuul-jobs-test-packer
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: centos-8-plain
-          label: centos-8-plain
-
 - project:
     check:
       jobs:
@@ -151,9 +121,6 @@
         - zuul-jobs-test-packer-opensuse-tumbleweed-nv
         - zuul-jobs-test-packer-ubuntu-bionic
         - zuul-jobs-test-packer-ubuntu-xenial
-        - zuul-jobs-test-packer-ubuntu-bionic-plain
-        - zuul-jobs-test-packer-ubuntu-xenial-plain
-        - zuul-jobs-test-packer-centos-8-plain
     gate:
       jobs:
         - zuul-jobs-test-packer-centos-7
@@ -164,6 +131,3 @@
         - zuul-jobs-test-packer-opensuse-15
         - zuul-jobs-test-packer-ubuntu-bionic
         - zuul-jobs-test-packer-ubuntu-xenial
-        - zuul-jobs-test-packer-ubuntu-bionic-plain
-        - zuul-jobs-test-packer-ubuntu-xenial-plain
-        - zuul-jobs-test-packer-centos-8-plain
diff --git a/zuul-tests.d/python-jobs.yaml b/zuul-tests.d/python-jobs.yaml
index 36cf00af7..fcf69afdf 100644
--- a/zuul-tests.d/python-jobs.yaml
+++ b/zuul-tests.d/python-jobs.yaml
@@ -98,36 +98,6 @@
         - 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
-    parent: zuul-jobs-test-ensure-pip
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: ubuntu-bionic-plain
-          label: ubuntu-bionic-plain
-
-- job:
-    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-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-sphinx
     description: Test the ensure-sphinx role
@@ -237,36 +207,6 @@
         - 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
-    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-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-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-fetch-sphinx-tarball
     description: Test the fetch-sphinx-tarball role
@@ -369,36 +309,6 @@
         - 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
-    parent: zuul-jobs-test-fetch-sphinx-tarball
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: ubuntu-bionic-plain
-          label: ubuntu-bionic-plain
-
-- job:
-    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-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-tox
     description: Test the tox role's sibling functionality
@@ -513,9 +423,6 @@
         - zuul-jobs-test-ensure-pip-opensuse-tumbleweed-nv
         - zuul-jobs-test-ensure-pip-ubuntu-bionic
         - 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-sphinx
         - zuul-jobs-test-ensure-tox-centos-7
         - zuul-jobs-test-ensure-tox-centos-8
@@ -526,9 +433,6 @@
         - zuul-jobs-test-ensure-tox-opensuse-tumbleweed-nv
         - zuul-jobs-test-ensure-tox-ubuntu-bionic
         - 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-fetch-sphinx-tarball-centos-7
         - zuul-jobs-test-fetch-sphinx-tarball-centos-8
         - zuul-jobs-test-fetch-sphinx-tarball-debian-stretch
@@ -538,9 +442,6 @@
         - zuul-jobs-test-fetch-sphinx-tarball-opensuse-tumbleweed-nv
         - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-bionic
         - 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-tox
         - zuul-jobs-test-fetch-tox-output
         - zuul-jobs-test-fetch-tox-output-synchronize
@@ -560,9 +461,6 @@
         - zuul-jobs-test-ensure-pip-opensuse-15
         - zuul-jobs-test-ensure-pip-ubuntu-bionic
         - 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-sphinx
         - zuul-jobs-test-ensure-tox-centos-7
         - zuul-jobs-test-ensure-tox-centos-8
@@ -572,9 +470,6 @@
         - zuul-jobs-test-ensure-tox-opensuse-15
         - zuul-jobs-test-ensure-tox-ubuntu-bionic
         - 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-fetch-sphinx-tarball-centos-7
         - zuul-jobs-test-fetch-sphinx-tarball-centos-8
         - zuul-jobs-test-fetch-sphinx-tarball-debian-stretch
@@ -583,9 +478,6 @@
         - zuul-jobs-test-fetch-sphinx-tarball-opensuse-15
         - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-bionic
         - 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-tox
         - 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 c6630b33a..20ec3e070 100644
--- a/zuul-tests.d/python-roles-jobs.yaml
+++ b/zuul-tests.d/python-roles-jobs.yaml
@@ -97,36 +97,6 @@
         - 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
-    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-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-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
-
 - project:
     check:
       jobs:
@@ -139,9 +109,6 @@
         - zuul-jobs-test-ensure-python-pyenv-opensuse-tumbleweed-nv
         - zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic
         - 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
     gate:
       jobs:
         - zuul-jobs-test-ensure-python-pyenv-centos-7
@@ -152,6 +119,3 @@
         - zuul-jobs-test-ensure-python-pyenv-opensuse-15
         - zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic
         - 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
diff --git a/zuul-tests.d/terraform-jobs.yaml b/zuul-tests.d/terraform-jobs.yaml
index f9eaba73f..82ae3c2d6 100644
--- a/zuul-tests.d/terraform-jobs.yaml
+++ b/zuul-tests.d/terraform-jobs.yaml
@@ -111,36 +111,6 @@
         - name: ubuntu-xenial
           label: ubuntu-xenial
 
-- job:
-    name: zuul-jobs-test-terraform-ubuntu-bionic-plain
-    description: Test terraform job on ubuntu-bionic-plain
-    parent: zuul-jobs-test-terraform
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: ubuntu-bionic-plain
-          label: ubuntu-bionic-plain
-
-- job:
-    name: zuul-jobs-test-terraform-ubuntu-xenial-plain
-    description: Test terraform job on ubuntu-xenial-plain
-    parent: zuul-jobs-test-terraform
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: ubuntu-xenial-plain
-          label: ubuntu-xenial-plain
-
-- job:
-    name: zuul-jobs-test-terraform-centos-8-plain
-    description: Test terraform job on centos-8-plain
-    parent: zuul-jobs-test-terraform
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: centos-8-plain
-          label: centos-8-plain
-
 - project:
     check: &id001
       jobs:
@@ -152,7 +122,4 @@
         - zuul-jobs-test-terraform-opensuse-15
         - zuul-jobs-test-terraform-ubuntu-bionic
         - zuul-jobs-test-terraform-ubuntu-xenial
-        - zuul-jobs-test-terraform-ubuntu-bionic-plain
-        - zuul-jobs-test-terraform-ubuntu-xenial-plain
-        - zuul-jobs-test-terraform-centos-8-plain
     gate: *id001