From 7b4b9b638f8a9e811d2a2057af72e3187c3a35dc Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Thu, 28 Jul 2022 07:43:18 -0700
Subject: [PATCH] Sort supported platforms
This sorts the supported test platforms so that we can more easily
modify them in a future change.
Change-Id: I3a3a0347b89ab90d6ee74bc3070f7ad3604d59df
---
tools/update-test-platforms.py | 4 +-
zuul-tests.d/general-roles-jobs.yaml | 106 ++++++++++++-------------
zuul-tests.d/go-jobs.yaml | 22 ++---
zuul-tests.d/nim-jobs.yaml | 24 +++---
zuul-tests.d/packer-jobs.yaml | 22 ++---
zuul-tests.d/python-jobs.yaml | 66 +++++++--------
zuul-tests.d/python-roles-jobs.yaml | 44 +++++-----
zuul-tests.d/rust-jobs.yaml | 22 ++---
zuul-tests.d/terraform-jobs-roles.yaml | 44 +++++-----
9 files changed, 177 insertions(+), 177 deletions(-)
diff --git a/tools/update-test-platforms.py b/tools/update-test-platforms.py
index c1b22c282..28faa82fb 100755
--- a/tools/update-test-platforms.py
+++ b/tools/update-test-platforms.py
@@ -30,13 +30,13 @@ import ruamellib
# in the multinode jobs, so just use the real labels everywhere.
PLATFORMS = [
+ # 'gentoo-17-0-systemd',
'centos-7',
'centos-8-stream',
'centos-9-stream',
- 'debian-buster',
'debian-bullseye',
+ 'debian-buster',
'fedora-35',
- # 'gentoo-17-0-systemd',
'opensuse-15',
'ubuntu-bionic',
'ubuntu-focal',
diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml
index a60d99ae5..04d12084a 100644
--- a/zuul-tests.d/general-roles-jobs.yaml
+++ b/zuul-tests.d/general-roles-jobs.yaml
@@ -162,16 +162,6 @@
- name: centos-9-stream
label: centos-9-stream
-- job:
- name: zuul-jobs-test-base-roles-debian-buster
- description: Tests roles in the 'base' job on debian-buster
- parent: zuul-jobs-test-base-roles
- tags: auto-generated
- nodeset:
- nodes:
- - name: debian-buster
- label: debian-buster
-
- job:
name: zuul-jobs-test-base-roles-debian-bullseye
description: Tests roles in the 'base' job on debian-bullseye
@@ -182,6 +172,16 @@
- name: debian-bullseye
label: debian-bullseye
+- job:
+ name: zuul-jobs-test-base-roles-debian-buster
+ description: Tests roles in the 'base' job on debian-buster
+ parent: zuul-jobs-test-base-roles
+ tags: auto-generated
+ nodeset:
+ nodes:
+ - name: debian-buster
+ label: debian-buster
+
- job:
name: zuul-jobs-test-base-roles-fedora-35
description: Tests roles in the 'base' job on fedora-35
@@ -275,16 +275,6 @@
- name: centos-9-stream
label: centos-9-stream
-- job:
- name: zuul-jobs-test-bindep-debian-buster
- description: Test the bindep role on debian-buster
- parent: zuul-jobs-test-bindep
- tags: auto-generated
- nodeset:
- nodes:
- - name: debian-buster
- label: debian-buster
-
- job:
name: zuul-jobs-test-bindep-debian-bullseye
description: Test the bindep role on debian-bullseye
@@ -295,6 +285,16 @@
- name: debian-bullseye
label: debian-bullseye
+- job:
+ name: zuul-jobs-test-bindep-debian-buster
+ description: Test the bindep role on debian-buster
+ parent: zuul-jobs-test-bindep
+ tags: auto-generated
+ nodeset:
+ nodes:
+ - name: debian-buster
+ label: debian-buster
+
- job:
name: zuul-jobs-test-bindep-fedora-35
description: Test the bindep role on fedora-35
@@ -429,16 +429,6 @@
- name: centos-9-stream
label: centos-9-stream
-- job:
- name: zuul-jobs-test-dstat-graph-debian-buster
- description: Test the dstat-graph roles on debian-buster
- parent: zuul-jobs-test-dstat-graph
- tags: auto-generated
- nodeset:
- nodes:
- - name: debian-buster
- label: debian-buster
-
- job:
name: zuul-jobs-test-dstat-graph-debian-bullseye
description: Test the dstat-graph roles on debian-bullseye
@@ -449,6 +439,16 @@
- name: debian-bullseye
label: debian-bullseye
+- job:
+ name: zuul-jobs-test-dstat-graph-debian-buster
+ description: Test the dstat-graph roles on debian-buster
+ parent: zuul-jobs-test-dstat-graph
+ tags: auto-generated
+ nodeset:
+ nodes:
+ - name: debian-buster
+ label: debian-buster
+
- job:
name: zuul-jobs-test-dstat-graph-fedora-35
description: Test the dstat-graph roles on fedora-35
@@ -574,25 +574,6 @@
nodes:
- secondary
-- job:
- name: zuul-jobs-test-multinode-roles-debian-buster
- description: Tests multinode setup roles on debian-buster
- parent: zuul-jobs-test-multinode-roles
- tags: auto-generated
- nodeset:
- nodes:
- - name: primary
- label: debian-buster
- - name: secondary
- label: debian-buster
- groups:
- - name: switch
- nodes:
- - primary
- - name: peers
- nodes:
- - secondary
-
- job:
name: zuul-jobs-test-multinode-roles-debian-bullseye
description: Tests multinode setup roles on debian-bullseye
@@ -612,6 +593,25 @@
nodes:
- secondary
+- job:
+ name: zuul-jobs-test-multinode-roles-debian-buster
+ description: Tests multinode setup roles on debian-buster
+ parent: zuul-jobs-test-multinode-roles
+ tags: auto-generated
+ nodeset:
+ nodes:
+ - name: primary
+ label: debian-buster
+ - name: secondary
+ label: debian-buster
+ groups:
+ - name: switch
+ nodes:
+ - primary
+ - name: peers
+ nodes:
+ - secondary
+
- job:
name: zuul-jobs-test-multinode-roles-fedora-35
description: Tests multinode setup roles on fedora-35
@@ -811,8 +811,8 @@
- zuul-jobs-test-base-roles-centos-7
- zuul-jobs-test-base-roles-centos-8-stream
- zuul-jobs-test-base-roles-centos-9-stream
- - zuul-jobs-test-base-roles-debian-buster
- zuul-jobs-test-base-roles-debian-bullseye
+ - zuul-jobs-test-base-roles-debian-buster
- zuul-jobs-test-base-roles-fedora-35
- zuul-jobs-test-base-roles-opensuse-15
- zuul-jobs-test-base-roles-ubuntu-bionic
@@ -821,8 +821,8 @@
- zuul-jobs-test-bindep-centos-7
- zuul-jobs-test-bindep-centos-8-stream
- zuul-jobs-test-bindep-centos-9-stream
- - zuul-jobs-test-bindep-debian-buster
- zuul-jobs-test-bindep-debian-bullseye
+ - zuul-jobs-test-bindep-debian-buster
- zuul-jobs-test-bindep-fedora-35
- zuul-jobs-test-bindep-opensuse-15
- zuul-jobs-test-bindep-ubuntu-bionic
@@ -835,8 +835,8 @@
- zuul-jobs-test-dstat-graph-centos-7
- zuul-jobs-test-dstat-graph-centos-8-stream
- zuul-jobs-test-dstat-graph-centos-9-stream
- - zuul-jobs-test-dstat-graph-debian-buster
- zuul-jobs-test-dstat-graph-debian-bullseye
+ - zuul-jobs-test-dstat-graph-debian-buster
- zuul-jobs-test-dstat-graph-fedora-35
- zuul-jobs-test-dstat-graph-opensuse-15
- zuul-jobs-test-dstat-graph-ubuntu-bionic
@@ -845,8 +845,8 @@
- zuul-jobs-test-multinode-roles-centos-7
- zuul-jobs-test-multinode-roles-centos-8-stream
- zuul-jobs-test-multinode-roles-centos-9-stream
- - zuul-jobs-test-multinode-roles-debian-buster
- zuul-jobs-test-multinode-roles-debian-bullseye
+ - zuul-jobs-test-multinode-roles-debian-buster
- zuul-jobs-test-multinode-roles-fedora-35
- zuul-jobs-test-multinode-roles-opensuse-15
- zuul-jobs-test-multinode-roles-ubuntu-bionic
diff --git a/zuul-tests.d/go-jobs.yaml b/zuul-tests.d/go-jobs.yaml
index e5783fbcf..806a027ee 100644
--- a/zuul-tests.d/go-jobs.yaml
+++ b/zuul-tests.d/go-jobs.yaml
@@ -45,16 +45,6 @@
- name: centos-9-stream
label: centos-9-stream
-- job:
- name: zuul-jobs-test-golang-go-debian-buster
- description: Test the golang-go job on debian-buster
- parent: zuul-jobs-test-golang-go
- tags: auto-generated
- nodeset:
- nodes:
- - name: debian-buster
- label: debian-buster
-
- job:
name: zuul-jobs-test-golang-go-debian-bullseye
description: Test the golang-go job on debian-bullseye
@@ -65,6 +55,16 @@
- name: debian-bullseye
label: debian-bullseye
+- job:
+ name: zuul-jobs-test-golang-go-debian-buster
+ description: Test the golang-go job on debian-buster
+ parent: zuul-jobs-test-golang-go
+ tags: auto-generated
+ nodeset:
+ nodes:
+ - name: debian-buster
+ label: debian-buster
+
- job:
name: zuul-jobs-test-golang-go-fedora-35
description: Test the golang-go job on fedora-35
@@ -121,8 +121,8 @@
- zuul-jobs-test-golang-go-centos-7
- zuul-jobs-test-golang-go-centos-8-stream
- zuul-jobs-test-golang-go-centos-9-stream
- - zuul-jobs-test-golang-go-debian-buster
- zuul-jobs-test-golang-go-debian-bullseye
+ - zuul-jobs-test-golang-go-debian-buster
- zuul-jobs-test-golang-go-fedora-35
- zuul-jobs-test-golang-go-opensuse-15
- zuul-jobs-test-golang-go-ubuntu-bionic
diff --git a/zuul-tests.d/nim-jobs.yaml b/zuul-tests.d/nim-jobs.yaml
index 05c1f358c..8f9e5b207 100644
--- a/zuul-tests.d/nim-jobs.yaml
+++ b/zuul-tests.d/nim-jobs.yaml
@@ -44,16 +44,6 @@
- name: centos-9-stream
label: centos-9-stream
-- job:
- name: zuul-jobs-test-nimble-debian-buster
- description: Test the nimble job on debian-buster
- parent: zuul-jobs-test-nimble
- tags: auto-generated
- nodeset:
- nodes:
- - name: debian-buster
- label: debian-buster
-
- job:
name: zuul-jobs-test-nimble-debian-bullseye
description: Test the nimble job on debian-bullseye
@@ -64,6 +54,16 @@
- name: debian-bullseye
label: debian-bullseye
+- job:
+ name: zuul-jobs-test-nimble-debian-buster
+ description: Test the nimble job on debian-buster
+ parent: zuul-jobs-test-nimble
+ tags: auto-generated
+ nodeset:
+ nodes:
+ - name: debian-buster
+ label: debian-buster
+
- job:
name: zuul-jobs-test-nimble-fedora-35
description: Test the nimble job on fedora-35
@@ -121,8 +121,8 @@
- zuul-jobs-test-nimble-centos-7-nv
- zuul-jobs-test-nimble-centos-8-stream
- zuul-jobs-test-nimble-centos-9-stream
- - zuul-jobs-test-nimble-debian-buster
- zuul-jobs-test-nimble-debian-bullseye
+ - zuul-jobs-test-nimble-debian-buster
- zuul-jobs-test-nimble-fedora-35
- zuul-jobs-test-nimble-opensuse-15-nv
- zuul-jobs-test-nimble-ubuntu-bionic
@@ -132,8 +132,8 @@
jobs: &id001
- zuul-jobs-test-nimble-centos-8-stream
- zuul-jobs-test-nimble-centos-9-stream
- - zuul-jobs-test-nimble-debian-buster
- zuul-jobs-test-nimble-debian-bullseye
+ - zuul-jobs-test-nimble-debian-buster
- zuul-jobs-test-nimble-fedora-35
- zuul-jobs-test-nimble-ubuntu-bionic
- zuul-jobs-test-nimble-ubuntu-focal
diff --git a/zuul-tests.d/packer-jobs.yaml b/zuul-tests.d/packer-jobs.yaml
index 626da5dfd..4ec1812cb 100644
--- a/zuul-tests.d/packer-jobs.yaml
+++ b/zuul-tests.d/packer-jobs.yaml
@@ -47,16 +47,6 @@
- name: centos-9-stream
label: centos-9-stream
-- job:
- name: zuul-jobs-test-packer-debian-buster
- description: Test packer job on debian-buster
- parent: zuul-jobs-test-packer
- tags: auto-generated
- nodeset:
- nodes:
- - name: debian-buster
- label: debian-buster
-
- job:
name: zuul-jobs-test-packer-debian-bullseye
description: Test packer job on debian-bullseye
@@ -67,6 +57,16 @@
- name: debian-bullseye
label: debian-bullseye
+- job:
+ name: zuul-jobs-test-packer-debian-buster
+ description: Test packer job on debian-buster
+ parent: zuul-jobs-test-packer
+ tags: auto-generated
+ nodeset:
+ nodes:
+ - name: debian-buster
+ label: debian-buster
+
- job:
name: zuul-jobs-test-packer-fedora-35
description: Test packer job on fedora-35
@@ -123,8 +123,8 @@
- zuul-jobs-test-packer-centos-7
- zuul-jobs-test-packer-centos-8-stream
- zuul-jobs-test-packer-centos-9-stream
- - zuul-jobs-test-packer-debian-buster
- zuul-jobs-test-packer-debian-bullseye
+ - zuul-jobs-test-packer-debian-buster
- zuul-jobs-test-packer-fedora-35
- zuul-jobs-test-packer-opensuse-15
- zuul-jobs-test-packer-ubuntu-bionic
diff --git a/zuul-tests.d/python-jobs.yaml b/zuul-tests.d/python-jobs.yaml
index a2b6e6d5f..9c1724298 100644
--- a/zuul-tests.d/python-jobs.yaml
+++ b/zuul-tests.d/python-jobs.yaml
@@ -40,16 +40,6 @@
- name: centos-9-stream
label: centos-9-stream
-- job:
- name: zuul-jobs-test-ensure-pip-debian-buster
- description: Test the ensure-pip role on debian-buster
- parent: zuul-jobs-test-ensure-pip
- tags: auto-generated
- nodeset:
- nodes:
- - name: debian-buster
- label: debian-buster
-
- job:
name: zuul-jobs-test-ensure-pip-debian-bullseye
description: Test the ensure-pip role on debian-bullseye
@@ -60,6 +50,16 @@
- name: debian-bullseye
label: debian-bullseye
+- job:
+ name: zuul-jobs-test-ensure-pip-debian-buster
+ description: Test the ensure-pip role on debian-buster
+ parent: zuul-jobs-test-ensure-pip
+ tags: auto-generated
+ nodeset:
+ nodes:
+ - name: debian-buster
+ label: debian-buster
+
- job:
name: zuul-jobs-test-ensure-pip-fedora-35
description: Test the ensure-pip role on fedora-35
@@ -158,16 +158,6 @@
- name: centos-9-stream
label: centos-9-stream
-- job:
- name: zuul-jobs-test-ensure-tox-debian-buster
- description: Test the ensure-tox role on debian-buster
- parent: zuul-jobs-test-ensure-tox
- tags: auto-generated
- nodeset:
- nodes:
- - name: debian-buster
- label: debian-buster
-
- job:
name: zuul-jobs-test-ensure-tox-debian-bullseye
description: Test the ensure-tox role on debian-bullseye
@@ -178,6 +168,16 @@
- name: debian-bullseye
label: debian-bullseye
+- job:
+ name: zuul-jobs-test-ensure-tox-debian-buster
+ description: Test the ensure-tox role on debian-buster
+ parent: zuul-jobs-test-ensure-tox
+ tags: auto-generated
+ nodeset:
+ nodes:
+ - name: debian-buster
+ label: debian-buster
+
- job:
name: zuul-jobs-test-ensure-tox-fedora-35
description: Test the ensure-tox role on fedora-35
@@ -270,16 +270,6 @@
- name: centos-9-stream
label: centos-9-stream
-- job:
- name: zuul-jobs-test-fetch-sphinx-tarball-debian-buster
- description: Test the fetch-sphinx-tarball role on debian-buster
- parent: zuul-jobs-test-fetch-sphinx-tarball
- tags: auto-generated
- nodeset:
- nodes:
- - name: debian-buster
- label: debian-buster
-
- job:
name: zuul-jobs-test-fetch-sphinx-tarball-debian-bullseye
description: Test the fetch-sphinx-tarball role on debian-bullseye
@@ -290,6 +280,16 @@
- name: debian-bullseye
label: debian-bullseye
+- job:
+ name: zuul-jobs-test-fetch-sphinx-tarball-debian-buster
+ description: Test the fetch-sphinx-tarball role on debian-buster
+ parent: zuul-jobs-test-fetch-sphinx-tarball
+ tags: auto-generated
+ nodeset:
+ nodes:
+ - name: debian-buster
+ label: debian-buster
+
- job:
name: zuul-jobs-test-fetch-sphinx-tarball-fedora-35
description: Test the fetch-sphinx-tarball role on fedora-35
@@ -456,8 +456,8 @@
- zuul-jobs-test-ensure-pip-centos-7
- zuul-jobs-test-ensure-pip-centos-8-stream
- zuul-jobs-test-ensure-pip-centos-9-stream
- - zuul-jobs-test-ensure-pip-debian-buster
- zuul-jobs-test-ensure-pip-debian-bullseye
+ - zuul-jobs-test-ensure-pip-debian-buster
- zuul-jobs-test-ensure-pip-fedora-35
- zuul-jobs-test-ensure-pip-opensuse-15
- zuul-jobs-test-ensure-pip-ubuntu-bionic
@@ -467,8 +467,8 @@
- zuul-jobs-test-ensure-tox-centos-7
- zuul-jobs-test-ensure-tox-centos-8-stream
- zuul-jobs-test-ensure-tox-centos-9-stream
- - zuul-jobs-test-ensure-tox-debian-buster
- zuul-jobs-test-ensure-tox-debian-bullseye
+ - zuul-jobs-test-ensure-tox-debian-buster
- zuul-jobs-test-ensure-tox-fedora-35
- zuul-jobs-test-ensure-tox-opensuse-15
- zuul-jobs-test-ensure-tox-ubuntu-bionic
@@ -477,8 +477,8 @@
- zuul-jobs-test-fetch-sphinx-tarball-centos-7
- zuul-jobs-test-fetch-sphinx-tarball-centos-8-stream
- zuul-jobs-test-fetch-sphinx-tarball-centos-9-stream
- - zuul-jobs-test-fetch-sphinx-tarball-debian-buster
- zuul-jobs-test-fetch-sphinx-tarball-debian-bullseye
+ - zuul-jobs-test-fetch-sphinx-tarball-debian-buster
- zuul-jobs-test-fetch-sphinx-tarball-fedora-35
- zuul-jobs-test-fetch-sphinx-tarball-opensuse-15
- zuul-jobs-test-fetch-sphinx-tarball-ubuntu-bionic
diff --git a/zuul-tests.d/python-roles-jobs.yaml b/zuul-tests.d/python-roles-jobs.yaml
index 3b0fc1b07..d832c231a 100644
--- a/zuul-tests.d/python-roles-jobs.yaml
+++ b/zuul-tests.d/python-roles-jobs.yaml
@@ -42,16 +42,6 @@
- name: centos-9-stream
label: centos-9-stream
-- job:
- name: zuul-jobs-test-build-python-release-jobs-debian-buster
- description: Test the build-python-release-jobs role on debian-buster
- parent: zuul-jobs-test-build-python-release-jobs
- tags: auto-generated
- nodeset:
- nodes:
- - name: debian-buster
- label: debian-buster
-
- job:
name: zuul-jobs-test-build-python-release-jobs-debian-bullseye
description: Test the build-python-release-jobs role on debian-bullseye
@@ -62,6 +52,16 @@
- name: debian-bullseye
label: debian-bullseye
+- job:
+ name: zuul-jobs-test-build-python-release-jobs-debian-buster
+ description: Test the build-python-release-jobs role on debian-buster
+ parent: zuul-jobs-test-build-python-release-jobs
+ tags: auto-generated
+ nodeset:
+ nodes:
+ - name: debian-buster
+ label: debian-buster
+
- job:
name: zuul-jobs-test-build-python-release-jobs-fedora-35
description: Test the build-python-release-jobs role on fedora-35
@@ -151,16 +151,6 @@
- name: centos-9-stream
label: centos-9-stream
-- job:
- name: zuul-jobs-test-ensure-python-pyenv-debian-buster
- description: Test the ensure-python role with pyenv on debian-buster
- parent: zuul-jobs-test-ensure-python-pyenv
- tags: auto-generated
- nodeset:
- nodes:
- - name: debian-buster
- label: debian-buster
-
- job:
name: zuul-jobs-test-ensure-python-pyenv-debian-bullseye
description: Test the ensure-python role with pyenv on debian-bullseye
@@ -171,6 +161,16 @@
- name: debian-bullseye
label: debian-bullseye
+- job:
+ name: zuul-jobs-test-ensure-python-pyenv-debian-buster
+ description: Test the ensure-python role with pyenv on debian-buster
+ parent: zuul-jobs-test-ensure-python-pyenv
+ tags: auto-generated
+ nodeset:
+ nodes:
+ - name: debian-buster
+ label: debian-buster
+
- job:
name: zuul-jobs-test-ensure-python-pyenv-fedora-35
description: Test the ensure-python role with pyenv on fedora-35
@@ -227,8 +227,8 @@
- zuul-jobs-test-build-python-release-jobs-centos-7
- zuul-jobs-test-build-python-release-jobs-centos-8-stream
- zuul-jobs-test-build-python-release-jobs-centos-9-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-debian-buster
- 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-ubuntu-bionic
@@ -237,8 +237,8 @@
- zuul-jobs-test-ensure-python-pyenv-centos-7
- zuul-jobs-test-ensure-python-pyenv-centos-8-stream
- zuul-jobs-test-ensure-python-pyenv-centos-9-stream
- - zuul-jobs-test-ensure-python-pyenv-debian-buster
- zuul-jobs-test-ensure-python-pyenv-debian-bullseye
+ - zuul-jobs-test-ensure-python-pyenv-debian-buster
- zuul-jobs-test-ensure-python-pyenv-fedora-35
- zuul-jobs-test-ensure-python-pyenv-opensuse-15
- zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic
diff --git a/zuul-tests.d/rust-jobs.yaml b/zuul-tests.d/rust-jobs.yaml
index 2a8984794..fdd0369dc 100644
--- a/zuul-tests.d/rust-jobs.yaml
+++ b/zuul-tests.d/rust-jobs.yaml
@@ -44,16 +44,6 @@
- name: centos-9-stream
label: centos-9-stream
-- job:
- name: zuul-jobs-test-rust-debian-buster
- description: Test the rust roles on debian-buster
- parent: zuul-jobs-test-rust
- tags: auto-generated
- nodeset:
- nodes:
- - name: debian-buster
- label: debian-buster
-
- job:
name: zuul-jobs-test-rust-debian-bullseye
description: Test the rust roles on debian-bullseye
@@ -64,6 +54,16 @@
- name: debian-bullseye
label: debian-bullseye
+- job:
+ name: zuul-jobs-test-rust-debian-buster
+ description: Test the rust roles on debian-buster
+ parent: zuul-jobs-test-rust
+ tags: auto-generated
+ nodeset:
+ nodes:
+ - name: debian-buster
+ label: debian-buster
+
- job:
name: zuul-jobs-test-rust-fedora-35
description: Test the rust roles on fedora-35
@@ -120,8 +120,8 @@
- zuul-jobs-test-rust-centos-7
- zuul-jobs-test-rust-centos-8-stream
- zuul-jobs-test-rust-centos-9-stream
- - zuul-jobs-test-rust-debian-buster
- zuul-jobs-test-rust-debian-bullseye
+ - zuul-jobs-test-rust-debian-buster
- zuul-jobs-test-rust-fedora-35
- zuul-jobs-test-rust-opensuse-15
- zuul-jobs-test-rust-ubuntu-bionic
diff --git a/zuul-tests.d/terraform-jobs-roles.yaml b/zuul-tests.d/terraform-jobs-roles.yaml
index c0d6c255d..a83225369 100644
--- a/zuul-tests.d/terraform-jobs-roles.yaml
+++ b/zuul-tests.d/terraform-jobs-roles.yaml
@@ -49,16 +49,6 @@
- name: centos-9-stream
label: centos-9-stream
-- job:
- name: zuul-jobs-test-terraform-debian-buster
- description: Test terraform job on debian-buster
- parent: zuul-jobs-test-terraform
- tags: auto-generated
- nodeset:
- nodes:
- - name: debian-buster
- label: debian-buster
-
- job:
name: zuul-jobs-test-terraform-debian-bullseye
description: Test terraform job on debian-bullseye
@@ -69,6 +59,16 @@
- name: debian-bullseye
label: debian-bullseye
+- job:
+ name: zuul-jobs-test-terraform-debian-buster
+ description: Test terraform job on debian-buster
+ parent: zuul-jobs-test-terraform
+ tags: auto-generated
+ nodeset:
+ nodes:
+ - name: debian-buster
+ label: debian-buster
+
- job:
name: zuul-jobs-test-terraform-fedora-35
description: Test terraform job on fedora-35
@@ -171,16 +171,6 @@
- name: centos-9-stream
label: centos-9-stream
-- job:
- name: zuul-jobs-test-terraform-role-debian-buster
- description: Test terraform roles on debian-buster
- parent: zuul-jobs-test-terraform-role
- tags: auto-generated
- nodeset:
- nodes:
- - name: debian-buster
- label: debian-buster
-
- job:
name: zuul-jobs-test-terraform-role-debian-bullseye
description: Test terraform roles on debian-bullseye
@@ -191,6 +181,16 @@
- name: debian-bullseye
label: debian-bullseye
+- job:
+ name: zuul-jobs-test-terraform-role-debian-buster
+ description: Test terraform roles on debian-buster
+ parent: zuul-jobs-test-terraform-role
+ tags: auto-generated
+ nodeset:
+ nodes:
+ - name: debian-buster
+ label: debian-buster
+
- job:
name: zuul-jobs-test-terraform-role-fedora-35
description: Test terraform roles on fedora-35
@@ -247,8 +247,8 @@
- zuul-jobs-test-terraform-centos-7
- zuul-jobs-test-terraform-centos-8-stream
- zuul-jobs-test-terraform-centos-9-stream
- - zuul-jobs-test-terraform-debian-buster
- zuul-jobs-test-terraform-debian-bullseye
+ - zuul-jobs-test-terraform-debian-buster
- zuul-jobs-test-terraform-fedora-35
- zuul-jobs-test-terraform-opensuse-15
- zuul-jobs-test-terraform-ubuntu-bionic
@@ -257,8 +257,8 @@
- zuul-jobs-test-terraform-role-centos-7
- zuul-jobs-test-terraform-role-centos-8-stream
- zuul-jobs-test-terraform-role-centos-9-stream
- - zuul-jobs-test-terraform-role-debian-buster
- zuul-jobs-test-terraform-role-debian-bullseye
+ - zuul-jobs-test-terraform-role-debian-buster
- zuul-jobs-test-terraform-role-fedora-35
- zuul-jobs-test-terraform-role-opensuse-15
- zuul-jobs-test-terraform-role-ubuntu-bionic