From c6978167866858e09868519b8c5c40784a29eb07 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 8 Dec 2021 10:00:06 -0800
Subject: [PATCH] Remove tumbleweed jobs

OpenDev doesn't currently have an image built for tumblweed. Rather than
try and fix this image up and get it running again OpenDev has proposed
it simply be removed. In preparation for that and to avoid running jobs
for a system that doesn't currently have an image we remove the jobs
here.

It was hoped that tumbleweed would be a good forward looking platform
but it seems to need a lot more care than we are able to give it.
Additionally Zuul is probably the major consumer of the platform and it
doesn't see much consumption by other projects.

Change-Id: Iad351b6da1f08183bc4c49c049c303a9491af844
---
 tools/update-test-platforms.py         |   2 -
 zuul-tests.d/general-roles-jobs.yaml   | 113 +------------------------
 zuul-tests.d/go-jobs.yaml              |  25 +-----
 zuul-tests.d/nim-jobs.yaml             |  25 +-----
 zuul-tests.d/packer-jobs.yaml          |  25 +-----
 zuul-tests.d/python-jobs.yaml          |  77 +----------------
 zuul-tests.d/python-roles-jobs.yaml    |  46 +---------
 zuul-tests.d/rust-jobs.yaml            |  25 +-----
 zuul-tests.d/terraform-jobs-roles.yaml |  22 -----
 9 files changed, 14 insertions(+), 346 deletions(-)

diff --git a/tools/update-test-platforms.py b/tools/update-test-platforms.py
index f58b606e8..7abe4264d 100755
--- a/tools/update-test-platforms.py
+++ b/tools/update-test-platforms.py
@@ -38,14 +38,12 @@ PLATFORMS = [
     'fedora-35',
     # 'gentoo-17-0-systemd',
     'opensuse-15',
-    'opensuse-tumbleweed',
     'ubuntu-bionic',
     'ubuntu-focal',
 ]
 
 # insert a platform from above to make it non-voting
 NON_VOTING = [
-    'opensuse-tumbleweed',
 ]
 
 # Insert a job to make that single job non-voting
diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml
index 7bf8921d1..f3f9ae1e1 100644
--- a/zuul-tests.d/general-roles-jobs.yaml
+++ b/zuul-tests.d/general-roles-jobs.yaml
@@ -194,17 +194,6 @@
         - name: opensuse-15
           label: opensuse-15
 
-- job:
-    name: zuul-jobs-test-base-roles-opensuse-tumbleweed-nv
-    voting: false
-    description: Tests roles in the 'base' job on opensuse-tumbleweed
-    parent: zuul-jobs-test-base-roles
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: opensuse-tumbleweed
-          label: opensuse-tumbleweed
-
 - job:
     name: zuul-jobs-test-base-roles-ubuntu-bionic
     description: Tests roles in the 'base' job on ubuntu-bionic
@@ -308,17 +297,6 @@
         - name: opensuse-15
           label: opensuse-15
 
-- job:
-    name: zuul-jobs-test-bindep-opensuse-tumbleweed-nv
-    voting: false
-    description: Test the bindep role on opensuse-tumbleweed
-    parent: zuul-jobs-test-bindep
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: opensuse-tumbleweed
-          label: opensuse-tumbleweed
-
 - job:
     name: zuul-jobs-test-bindep-ubuntu-bionic
     description: Test the bindep role on ubuntu-bionic
@@ -462,17 +440,6 @@
         - name: opensuse-15
           label: opensuse-15
 
-- job:
-    name: zuul-jobs-test-dstat-graph-opensuse-tumbleweed-nv
-    voting: false
-    description: Test the dstat-graph roles on opensuse-tumbleweed
-    parent: zuul-jobs-test-dstat-graph
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: opensuse-tumbleweed
-          label: opensuse-tumbleweed
-
 - job:
     name: zuul-jobs-test-dstat-graph-ubuntu-bionic
     description: Test the dstat-graph roles on ubuntu-bionic
@@ -644,26 +611,6 @@
           nodes:
             - secondary
 
-- job:
-    name: zuul-jobs-test-multinode-roles-opensuse-tumbleweed-nv
-    voting: false
-    description: Tests multinode setup roles on opensuse-tumbleweed
-    parent: zuul-jobs-test-multinode-roles
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: primary
-          label: opensuse-tumbleweed
-        - name: secondary
-          label: opensuse-tumbleweed
-      groups:
-        - name: switch
-          nodes:
-            - primary
-        - name: peers
-          nodes:
-            - secondary
-
 - job:
     name: zuul-jobs-test-multinode-roles-ubuntu-bionic
     description: Tests multinode setup roles on ubuntu-bionic
@@ -798,64 +745,6 @@
 
 - project:
     check:
-      jobs:
-        - zuul-jobs-test-add-authorized-keys
-        - zuul-jobs-test-add-gpgkey
-        - zuul-jobs-test-add-sshkey
-        - zuul-jobs-test-base-roles-centos-7
-        - zuul-jobs-test-base-roles-centos-8
-        - zuul-jobs-test-base-roles-centos-8-stream
-        - zuul-jobs-test-base-roles-debian-buster
-        - zuul-jobs-test-base-roles-debian-bullseye
-        - zuul-jobs-test-base-roles-fedora-35
-        - 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-focal
-        - zuul-jobs-test-bindep-centos-7
-        - zuul-jobs-test-bindep-centos-8
-        - zuul-jobs-test-bindep-centos-8-stream
-        - zuul-jobs-test-bindep-debian-buster
-        - zuul-jobs-test-bindep-debian-bullseye
-        - zuul-jobs-test-bindep-fedora-35
-        - zuul-jobs-test-bindep-opensuse-15
-        - zuul-jobs-test-bindep-opensuse-tumbleweed-nv
-        - zuul-jobs-test-bindep-ubuntu-bionic
-        - zuul-jobs-test-bindep-ubuntu-focal
-        - zuul-jobs-test-clear-firewall
-        - zuul-jobs-test-enable-fips
-        - zuul-jobs-test-ensure-bazelisk
-        - zuul-jobs-test-netconsole
-        - zuul-jobs-test-dstat-graph-centos-7
-        - zuul-jobs-test-dstat-graph-centos-8
-        - zuul-jobs-test-dstat-graph-centos-8-stream
-        - zuul-jobs-test-dstat-graph-debian-buster
-        - zuul-jobs-test-dstat-graph-debian-bullseye
-        - zuul-jobs-test-dstat-graph-fedora-35
-        - zuul-jobs-test-dstat-graph-opensuse-15
-        - zuul-jobs-test-dstat-graph-opensuse-tumbleweed-nv
-        - zuul-jobs-test-dstat-graph-ubuntu-bionic
-        - zuul-jobs-test-dstat-graph-ubuntu-focal
-        - zuul-jobs-test-multinode-roles-centos-7
-        - zuul-jobs-test-multinode-roles-centos-8
-        - zuul-jobs-test-multinode-roles-centos-8-stream
-        - zuul-jobs-test-multinode-roles-debian-buster
-        - zuul-jobs-test-multinode-roles-debian-bullseye
-        - zuul-jobs-test-multinode-roles-fedora-35
-        - 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-focal
-        - zuul-jobs-test-generate-zuul-manifest
-        - zuul-jobs-test-upload-artifactory
-        - zuul-jobs-test-upload-git-mirror
-        - zuul-jobs-test-shake-build
-        - zuul-jobs-test-ensure-zookeeper
-        - zuul-jobs-test-update-json-file
-        - zuul-jobs-test-stage-output
-        - zuul-jobs-test-fetch-translation-output
-        - zuul-jobs-test-fetch-translation-output-synchronize
-    gate:
       jobs: &id001
         - zuul-jobs-test-add-authorized-keys
         - zuul-jobs-test-add-gpgkey
@@ -909,5 +798,7 @@
         - zuul-jobs-test-stage-output
         - zuul-jobs-test-fetch-translation-output
         - zuul-jobs-test-fetch-translation-output-synchronize
+    gate:
+      jobs: *id001
     periodic-weekly:
       jobs: *id001
diff --git a/zuul-tests.d/go-jobs.yaml b/zuul-tests.d/go-jobs.yaml
index 6044714d9..9cd047c0b 100644
--- a/zuul-tests.d/go-jobs.yaml
+++ b/zuul-tests.d/go-jobs.yaml
@@ -85,17 +85,6 @@
         - name: opensuse-15
           label: opensuse-15
 
-- job:
-    name: zuul-jobs-test-golang-go-opensuse-tumbleweed-nv
-    voting: false
-    description: Test the golang-go job on opensuse-tumbleweed
-    parent: zuul-jobs-test-golang-go
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: opensuse-tumbleweed
-          label: opensuse-tumbleweed
-
 - job:
     name: zuul-jobs-test-golang-go-ubuntu-bionic
     description: Test the golang-go job on ubuntu-bionic
@@ -118,18 +107,6 @@
 
 - project:
     check:
-      jobs:
-        - zuul-jobs-test-golang-go-centos-7
-        - zuul-jobs-test-golang-go-centos-8
-        - zuul-jobs-test-golang-go-centos-8-stream
-        - zuul-jobs-test-golang-go-debian-buster
-        - zuul-jobs-test-golang-go-debian-bullseye
-        - zuul-jobs-test-golang-go-fedora-35
-        - 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-focal
-    gate:
       jobs: &id001
         - zuul-jobs-test-golang-go-centos-7
         - zuul-jobs-test-golang-go-centos-8
@@ -140,5 +117,7 @@
         - zuul-jobs-test-golang-go-opensuse-15
         - zuul-jobs-test-golang-go-ubuntu-bionic
         - zuul-jobs-test-golang-go-ubuntu-focal
+    gate:
+      jobs: *id001
     periodic-weekly:
       jobs: *id001
diff --git a/zuul-tests.d/nim-jobs.yaml b/zuul-tests.d/nim-jobs.yaml
index bcfc26cb0..446c62897 100644
--- a/zuul-tests.d/nim-jobs.yaml
+++ b/zuul-tests.d/nim-jobs.yaml
@@ -83,17 +83,6 @@
         - name: opensuse-15
           label: opensuse-15
 
-- job:
-    name: zuul-jobs-test-nimble-opensuse-tumbleweed-nv
-    voting: false
-    description: Test the nimble job on opensuse-tumbleweed
-    parent: zuul-jobs-test-nimble
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: opensuse-tumbleweed
-          label: opensuse-tumbleweed
-
 - job:
     name: zuul-jobs-test-nimble-ubuntu-bionic
     description: Test the nimble job on ubuntu-bionic
@@ -116,18 +105,6 @@
 
 - project:
     check:
-      jobs:
-        - zuul-jobs-test-nimble-centos-7
-        - zuul-jobs-test-nimble-centos-8
-        - zuul-jobs-test-nimble-centos-8-stream
-        - zuul-jobs-test-nimble-debian-buster
-        - zuul-jobs-test-nimble-debian-bullseye
-        - zuul-jobs-test-nimble-fedora-35
-        - zuul-jobs-test-nimble-opensuse-15
-        - zuul-jobs-test-nimble-opensuse-tumbleweed-nv
-        - zuul-jobs-test-nimble-ubuntu-bionic
-        - zuul-jobs-test-nimble-ubuntu-focal
-    gate:
       jobs: &id001
         - zuul-jobs-test-nimble-centos-7
         - zuul-jobs-test-nimble-centos-8
@@ -138,5 +115,7 @@
         - zuul-jobs-test-nimble-opensuse-15
         - zuul-jobs-test-nimble-ubuntu-bionic
         - zuul-jobs-test-nimble-ubuntu-focal
+    gate:
+      jobs: *id001
     periodic-weekly:
       jobs: *id001
diff --git a/zuul-tests.d/packer-jobs.yaml b/zuul-tests.d/packer-jobs.yaml
index a737460ad..1c8e9862c 100644
--- a/zuul-tests.d/packer-jobs.yaml
+++ b/zuul-tests.d/packer-jobs.yaml
@@ -87,17 +87,6 @@
         - name: opensuse-15
           label: opensuse-15
 
-- job:
-    name: zuul-jobs-test-packer-opensuse-tumbleweed-nv
-    voting: false
-    description: Test packer job on opensuse-tumbleweed
-    parent: zuul-jobs-test-packer
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: opensuse-tumbleweed
-          label: opensuse-tumbleweed
-
 - job:
     name: zuul-jobs-test-packer-ubuntu-bionic
     description: Test packer job on ubuntu-bionic
@@ -120,18 +109,6 @@
 
 - project:
     check:
-      jobs:
-        - zuul-jobs-test-packer-centos-7
-        - zuul-jobs-test-packer-centos-8
-        - zuul-jobs-test-packer-centos-8-stream
-        - zuul-jobs-test-packer-debian-buster
-        - zuul-jobs-test-packer-debian-bullseye
-        - zuul-jobs-test-packer-fedora-35
-        - zuul-jobs-test-packer-opensuse-15
-        - zuul-jobs-test-packer-opensuse-tumbleweed-nv
-        - zuul-jobs-test-packer-ubuntu-bionic
-        - zuul-jobs-test-packer-ubuntu-focal
-    gate:
       jobs: &id001
         - zuul-jobs-test-packer-centos-7
         - zuul-jobs-test-packer-centos-8
@@ -142,5 +119,7 @@
         - zuul-jobs-test-packer-opensuse-15
         - zuul-jobs-test-packer-ubuntu-bionic
         - zuul-jobs-test-packer-ubuntu-focal
+    gate:
+      jobs: *id001
     periodic-weekly:
       jobs: *id001
diff --git a/zuul-tests.d/python-jobs.yaml b/zuul-tests.d/python-jobs.yaml
index 7880ceda5..e064d7be0 100644
--- a/zuul-tests.d/python-jobs.yaml
+++ b/zuul-tests.d/python-jobs.yaml
@@ -80,17 +80,6 @@
         - name: opensuse-15
           label: opensuse-15
 
-- job:
-    name: zuul-jobs-test-ensure-pip-opensuse-tumbleweed-nv
-    voting: false
-    description: Test the ensure-pip role on opensuse-tumbleweed
-    parent: zuul-jobs-test-ensure-pip
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: opensuse-tumbleweed
-          label: opensuse-tumbleweed
-
 - job:
     name: zuul-jobs-test-ensure-pip-ubuntu-bionic
     description: Test the ensure-pip role on ubuntu-bionic
@@ -199,17 +188,6 @@
         - name: opensuse-15
           label: opensuse-15
 
-- job:
-    name: zuul-jobs-test-ensure-tox-opensuse-tumbleweed-nv
-    voting: false
-    description: Test the ensure-tox role on opensuse-tumbleweed
-    parent: zuul-jobs-test-ensure-tox
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: opensuse-tumbleweed
-          label: opensuse-tumbleweed
-
 - job:
     name: zuul-jobs-test-ensure-tox-ubuntu-bionic
     description: Test the ensure-tox role on ubuntu-bionic
@@ -312,17 +290,6 @@
         - name: opensuse-15
           label: opensuse-15
 
-- job:
-    name: zuul-jobs-test-fetch-sphinx-tarball-opensuse-tumbleweed-nv
-    voting: false
-    description: Test the fetch-sphinx-tarball role on opensuse-tumbleweed
-    parent: zuul-jobs-test-fetch-sphinx-tarball
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: opensuse-tumbleweed
-          label: opensuse-tumbleweed
-
 - job:
     name: zuul-jobs-test-fetch-sphinx-tarball-ubuntu-bionic
     description: Test the fetch-sphinx-tarball role on ubuntu-bionic
@@ -447,48 +414,6 @@
 
 - project:
     check:
-      jobs:
-        - zuul-jobs-test-ensure-pip-centos-7
-        - zuul-jobs-test-ensure-pip-centos-8
-        - 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-opensuse-tumbleweed-nv
-        - 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
-        - 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-opensuse-tumbleweed-nv
-        - 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
-        - 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-opensuse-tumbleweed-nv
-        - 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
-    gate:
       jobs: &id001
         - zuul-jobs-test-ensure-pip-centos-7
         - zuul-jobs-test-ensure-pip-centos-8
@@ -527,5 +452,7 @@
         - zuul-jobs-test-fetch-sphinx-output-synchronize
         - zuul-jobs-test-fetch-sphinx-tarball-with-zuul-output
         - zuul-jobs-test-fetch-sphinx-tarball-synchronize
+    gate:
+      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 1f498d840..b6dfeb70f 100644
--- a/zuul-tests.d/python-roles-jobs.yaml
+++ b/zuul-tests.d/python-roles-jobs.yaml
@@ -82,17 +82,6 @@
         - name: opensuse-15
           label: opensuse-15
 
-- job:
-    name: zuul-jobs-test-build-python-release-jobs-opensuse-tumbleweed-nv
-    voting: false
-    description: Test the build-python-release-jobs role on opensuse-tumbleweed
-    parent: zuul-jobs-test-build-python-release-jobs
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: opensuse-tumbleweed
-          label: opensuse-tumbleweed
-
 - job:
     name: zuul-jobs-test-build-python-release-jobs-ubuntu-bionic
     description: Test the build-python-release-jobs role on ubuntu-bionic
@@ -192,17 +181,6 @@
         - name: opensuse-15
           label: opensuse-15
 
-- job:
-    name: zuul-jobs-test-ensure-python-pyenv-opensuse-tumbleweed-nv
-    voting: false
-    description: Test the ensure-python role with pyenv on opensuse-tumbleweed
-    parent: zuul-jobs-test-ensure-python-pyenv
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: opensuse-tumbleweed
-          label: opensuse-tumbleweed
-
 - job:
     name: zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic
     description: Test the ensure-python role with pyenv on ubuntu-bionic
@@ -225,28 +203,6 @@
 
 - project:
     check:
-      jobs:
-        - zuul-jobs-test-build-python-release-jobs-centos-7
-        - zuul-jobs-test-build-python-release-jobs-centos-8
-        - 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-opensuse-tumbleweed-nv
-        - 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
-        - zuul-jobs-test-ensure-python-pyenv-centos-8-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-opensuse-tumbleweed-nv
-        - 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
@@ -266,5 +222,7 @@
         - zuul-jobs-test-ensure-python-pyenv-opensuse-15
         - zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic
         - zuul-jobs-test-ensure-python-pyenv-ubuntu-focal
+    gate:
+      jobs: *id001
     periodic-weekly:
       jobs: *id001
diff --git a/zuul-tests.d/rust-jobs.yaml b/zuul-tests.d/rust-jobs.yaml
index b470c9d14..399fc7f49 100644
--- a/zuul-tests.d/rust-jobs.yaml
+++ b/zuul-tests.d/rust-jobs.yaml
@@ -84,17 +84,6 @@
         - name: opensuse-15
           label: opensuse-15
 
-- job:
-    name: zuul-jobs-test-rust-opensuse-tumbleweed-nv
-    voting: false
-    description: Test the rust roles on opensuse-tumbleweed
-    parent: zuul-jobs-test-rust
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: opensuse-tumbleweed
-          label: opensuse-tumbleweed
-
 - job:
     name: zuul-jobs-test-rust-ubuntu-bionic
     description: Test the rust roles on ubuntu-bionic
@@ -117,18 +106,6 @@
 
 - project:
     check:
-      jobs:
-        - zuul-jobs-test-rust-centos-7
-        - zuul-jobs-test-rust-centos-8
-        - zuul-jobs-test-rust-centos-8-stream
-        - zuul-jobs-test-rust-debian-buster
-        - zuul-jobs-test-rust-debian-bullseye
-        - zuul-jobs-test-rust-fedora-35
-        - zuul-jobs-test-rust-opensuse-15
-        - zuul-jobs-test-rust-opensuse-tumbleweed-nv
-        - zuul-jobs-test-rust-ubuntu-bionic
-        - zuul-jobs-test-rust-ubuntu-focal
-    gate:
       jobs: &id001
         - zuul-jobs-test-rust-centos-7
         - zuul-jobs-test-rust-centos-8
@@ -139,5 +116,7 @@
         - zuul-jobs-test-rust-opensuse-15
         - zuul-jobs-test-rust-ubuntu-bionic
         - zuul-jobs-test-rust-ubuntu-focal
+    gate:
+      jobs: *id001
     periodic-weekly:
       jobs: *id001
diff --git a/zuul-tests.d/terraform-jobs-roles.yaml b/zuul-tests.d/terraform-jobs-roles.yaml
index 1b5a371ef..ef96d0e9e 100644
--- a/zuul-tests.d/terraform-jobs-roles.yaml
+++ b/zuul-tests.d/terraform-jobs-roles.yaml
@@ -89,17 +89,6 @@
         - name: opensuse-15
           label: opensuse-15
 
-- job:
-    name: zuul-jobs-test-terraform-opensuse-tumbleweed-nv
-    voting: false
-    description: Test terraform job on opensuse-tumbleweed
-    parent: zuul-jobs-test-terraform
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: opensuse-tumbleweed
-          label: opensuse-tumbleweed
-
 - job:
     name: zuul-jobs-test-terraform-ubuntu-bionic
     description: Test terraform job on ubuntu-bionic
@@ -212,17 +201,6 @@
         - name: opensuse-15
           label: opensuse-15
 
-- job:
-    name: zuul-jobs-test-terraform-role-opensuse-tumbleweed-nv
-    voting: false
-    description: Test terraform roles on opensuse-tumbleweed
-    parent: zuul-jobs-test-terraform-role
-    tags: auto-generated
-    nodeset:
-      nodes:
-        - name: opensuse-tumbleweed
-          label: opensuse-tumbleweed
-
 - job:
     name: zuul-jobs-test-terraform-role-ubuntu-bionic
     description: Test terraform roles on ubuntu-bionic