From aea969d4786f58594b4d4bd1965edb8ce0ccd1b4 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 16 Jul 2025 13:38:49 -0700 Subject: [PATCH] Remove niz- nodesets These nodesets were added so that we could specifically request nodes from niz. Now that all nodes are from niz, remove them. The non-niz centos nodesets incorrectly referenced niz labels; those have been corrected. Change-Id: I5cccc4bc90b77c82b0a78b843f4b80c8a50fd3c4 --- zuul.d/nodesets.yaml | 194 +------------------------------------------ 1 file changed, 2 insertions(+), 192 deletions(-) diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index f16b9a0..8924b2e 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -1,30 +1,14 @@ -# All nodesets with "niz-" in the name are temporary so that the zuul -# tenant can opt-in to using them specifically. Don't use them for -# new work. - -- nodeset: - name: niz-centos-9-stream-4GB - nodes: - name: centos-9-stream - label: niz-centos-9-stream-4GB - - nodeset: name: centos-9-stream-4GB nodes: name: centos-9-stream - label: niz-centos-9-stream-4GB - -- nodeset: - name: niz-centos-9-stream-8GB - nodes: - name: centos-9-stream - label: niz-centos-9-stream-8GB + label: centos-9-stream-4GB - nodeset: name: centos-9-stream-8GB nodes: name: centos-9-stream - label: niz-centos-9-stream-8GB + label: centos-9-stream-8GB # A legacy nodeset from nodepool - nodeset: @@ -33,24 +17,12 @@ name: centos-9-stream label: centos-9-stream-8GB -- nodeset: - name: niz-centos-9-stream-16GB - nodes: - name: centos-9-stream - label: niz-centos-9-stream-16GB - - nodeset: name: centos-9-stream-16GB nodes: name: centos-9-stream label: centos-9-stream-16GB -- nodeset: - name: niz-centos-9-stream-arm64-8GB - nodes: - name: centos-9-stream-arm64 - label: niz-centos-9-stream-arm64-8GB - - nodeset: name: centos-9-stream-arm64-8GB nodes: @@ -64,36 +36,18 @@ name: centos-9-stream-arm64 label: centos-9-stream-arm64-8GB -- nodeset: - name: niz-centos-9-stream-arm64-16GB - nodes: - name: centos-9-stream-arm64 - label: niz-centos-9-stream-arm64-16GB - - nodeset: name: centos-9-stream-arm64-16GB nodes: name: centos-9-stream-arm64 label: centos-9-stream-arm64-16GB -- nodeset: - name: niz-debian-bookworm-4GB - nodes: - name: debian-bookworm - label: niz-debian-bookworm-4GB - - nodeset: name: debian-bookworm-4GB nodes: name: debian-bookworm label: debian-bookworm-4GB -- nodeset: - name: niz-debian-bookworm-8GB - nodes: - name: debian-bookworm - label: niz-debian-bookworm-8GB - - nodeset: name: debian-bookworm-8GB nodes: @@ -107,24 +61,12 @@ name: debian-bookworm label: debian-bookworm-8GB -- nodeset: - name: niz-debian-bookworm-16GB - nodes: - name: debian-bookworm - label: niz-debian-bookworm-16GB - - nodeset: name: debian-bookworm-16GB nodes: name: debian-bookworm label: debian-bookworm-16GB -- nodeset: - name: niz-debian-bookworm-arm64-8GB - nodes: - name: debian-bookworm-arm64 - label: niz-debian-bookworm-arm64-8GB - - nodeset: name: debian-bookworm-arm64-8GB nodes: @@ -138,36 +80,18 @@ name: debian-bookworm-arm64 label: debian-bookworm-arm64-8GB -- nodeset: - name: niz-debian-bookworm-arm64-16GB - nodes: - name: debian-bookworm-arm64 - label: niz-debian-bookworm-arm64-16GB - - nodeset: name: debian-bookworm-arm64-16GB nodes: name: debian-bookworm-arm64 label: debian-bookworm-arm64-16GB -- nodeset: - name: niz-debian-bullseye-4GB - nodes: - name: debian-bullseye - label: niz-debian-bullseye-4GB - - nodeset: name: debian-bullseye-4GB nodes: name: debian-bullseye label: debian-bullseye-4GB -- nodeset: - name: niz-debian-bullseye-8GB - nodes: - name: debian-bullseye - label: niz-debian-bullseye-8GB - - nodeset: name: debian-bullseye-8GB nodes: @@ -181,24 +105,12 @@ name: debian-bullseye label: debian-bullseye-8GB -- nodeset: - name: niz-debian-bullseye-16GB - nodes: - name: debian-bullseye - label: niz-debian-bullseye-16GB - - nodeset: name: debian-bullseye-16GB nodes: name: debian-bullseye label: debian-bullseye-16GB -- nodeset: - name: niz-debian-bullseye-arm64-8GB - nodes: - name: debian-bullseye-arm64 - label: niz-debian-bullseye-arm64-8GB - - nodeset: name: debian-bullseye-arm64-8GB nodes: @@ -212,36 +124,18 @@ name: debian-bullseye-arm64 label: debian-bullseye-arm64-8GB -- nodeset: - name: niz-debian-bullseye-arm64-16GB - nodes: - name: debian-bullseye-arm64 - label: niz-debian-bullseye-arm64-16GB - - nodeset: name: debian-bullseye-arm64-16GB nodes: name: debian-bullseye-arm64 label: debian-bullseye-arm64-16GB -- nodeset: - name: niz-rockylinux-8-4GB - nodes: - name: rockylinux-8 - label: niz-rockylinux-8-4GB - - nodeset: name: rockylinux-8-4GB nodes: name: rockylinux-8 label: rockylinux-8-4GB -- nodeset: - name: niz-rockylinux-8-8GB - nodes: - name: rockylinux-8 - label: niz-rockylinux-8-8GB - - nodeset: name: rockylinux-8-8GB nodes: @@ -255,36 +149,18 @@ name: rockylinux-8 label: rockylinux-8-8GB -- nodeset: - name: niz-rockylinux-8-16GB - nodes: - name: rockylinux-8 - label: niz-rockylinux-8-16GB - - nodeset: name: rockylinux-8-16GB nodes: name: rockylinux-8 label: rockylinux-8-16GB -- nodeset: - name: niz-rockylinux-9-4GB - nodes: - name: rockylinux-9 - label: niz-rockylinux-9-4GB - - nodeset: name: rockylinux-9-4GB nodes: name: rockylinux-9 label: rockylinux-9-4GB -- nodeset: - name: niz-rockylinux-9-8GB - nodes: - name: rockylinux-9 - label: niz-rockylinux-9-8GB - - nodeset: name: rockylinux-9-8GB nodes: @@ -298,12 +174,6 @@ name: rockylinux-9 label: rockylinux-9-8GB -- nodeset: - name: niz-rockylinux-9-16GB - nodes: - name: rockylinux-9 - label: niz-rockylinux-9-16GB - - nodeset: name: rockylinux-9-16GB nodes: @@ -331,24 +201,12 @@ - name: ubuntu-focal-arm64 label: ubuntu-focal-arm64 -- nodeset: - name: niz-ubuntu-jammy-4GB - nodes: - name: ubuntu-jammy - label: niz-ubuntu-jammy-4GB - - nodeset: name: ubuntu-jammy-4GB nodes: name: ubuntu-jammy label: ubuntu-jammy-4GB -- nodeset: - name: niz-ubuntu-jammy-8GB - nodes: - name: ubuntu-jammy - label: niz-ubuntu-jammy-8GB - - nodeset: name: ubuntu-jammy-8GB nodes: @@ -362,24 +220,12 @@ name: ubuntu-jammy label: ubuntu-jammy-8GB -- nodeset: - name: niz-ubuntu-jammy-16GB - nodes: - name: ubuntu-jammy - label: niz-ubuntu-jammy-16GB - - nodeset: name: ubuntu-jammy-16GB nodes: name: ubuntu-jammy label: ubuntu-jammy-16GB -- nodeset: - name: niz-ubuntu-jammy-arm64-8GB - nodes: - name: ubuntu-jammy-arm64 - label: niz-ubuntu-jammy-arm64-8GB - - nodeset: name: ubuntu-jammy-arm64-8GB nodes: @@ -393,36 +239,18 @@ name: ubuntu-jammy-arm64 label: ubuntu-jammy-arm64-8GB -- nodeset: - name: niz-ubuntu-jammy-arm64-16GB - nodes: - name: ubuntu-jammy-arm64 - label: niz-ubuntu-jammy-arm64-16GB - - nodeset: name: ubuntu-jammy-arm64-16GB nodes: name: ubuntu-jammy-arm64 label: ubuntu-jammy-arm64-16GB -- nodeset: - name: niz-ubuntu-noble-4GB - nodes: - name: ubuntu-noble - label: niz-ubuntu-noble-4GB - - nodeset: name: ubuntu-noble-4GB nodes: name: ubuntu-noble label: ubuntu-noble-4GB -- nodeset: - name: niz-ubuntu-noble-8GB - nodes: - name: ubuntu-noble - label: niz-ubuntu-noble-8GB - - nodeset: name: ubuntu-noble-8GB nodes: @@ -436,24 +264,12 @@ name: ubuntu-noble label: ubuntu-noble-8GB -- nodeset: - name: niz-ubuntu-noble-16GB - nodes: - name: ubuntu-noble - label: niz-ubuntu-noble-16GB - - nodeset: name: ubuntu-noble-16GB nodes: name: ubuntu-noble label: ubuntu-noble-16GB -- nodeset: - name: niz-ubuntu-noble-arm64-8GB - nodes: - name: ubuntu-noble-arm64 - label: niz-ubuntu-noble-arm64-8GB - - nodeset: name: ubuntu-noble-arm64-8GB nodes: @@ -467,12 +283,6 @@ name: ubuntu-noble-arm64 label: ubuntu-noble-arm64-8GB -- nodeset: - name: niz-ubuntu-noble-arm64-16GB - nodes: - name: ubuntu-noble-arm64 - label: niz-ubuntu-noble-arm64-16GB - - nodeset: name: ubuntu-noble-arm64-16GB nodes: