Drop labels dedicated to cloud provider

When IBM private cloud would be removed, there is no need to keep
nodesets that would force spawning CI jobs on specific cloud
provider.

Depends-On: openstack-k8s-operators/watcher-operator#363

Signed-off-by: Daniel Pawlik <dpawlik@redhat.com>

Author: danpawlik

zuul.d/base.yaml

@@ -27,7 +27,7 @@
 - job:
     name: openstack-k8s-operators-content-provider
     parent: cifmw-base-minimal
-    nodeset: centos-stream-9-vexxhost
+    nodeset: centos-stream-9
     irrelevant-files: &ir_files
       - .*/*.md
       - ^.github/.*$
@@ -235,7 +235,7 @@
     parent: base-extracted-crc-ci-bootstrap-staging
     timeout: 10800
     attempts: 1
-    nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-18-1-3xl-vexxhost
+    nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-18-1-3xl
     irrelevant-files: *ir_files
     required-projects: *multinode_edpm_rp
     roles: *multinode_edpm_roles

zuul.d/nodeset.yaml

@@ -15,18 +15,6 @@
       - name: peers
         nodes: []
 
-- nodeset:
-    name: centos-stream-9-vexxhost
-    nodes:
-      - name: controller
-        label: cloud-centos-9-stream-tripleo-vexxhost
-    groups:
-      - name: switch
-        nodes:
-          - controller
-      - name: peers
-        nodes: []
-
 - nodeset:
     name: 4x-centos-9-medium
     nodes:
@@ -51,10 +39,10 @@
 #  CentOS Stream 10 nodeset
 #
 - nodeset:
-    name: centos-stream-10-vexxhost
+    name: centos-stream-10
     nodes:
       - name: controller
-        label: cloud-centos-10-stream-tripleo-vexxhost
+        label: cloud-centos-10-stream-tripleo
     groups:
       - name: switch
         nodes:
@@ -68,14 +56,14 @@
 
 # Used by watcher-operator
 - nodeset:
-    name: centos-9-medium-2x-centos-9-crc-extracted-2-39-0-3xl-vexxhost
+    name: centos-9-medium-2x-centos-9-crc-extracted-2-39-0-3xl
     nodes:
       - name: controller
-        label: cloud-centos-9-stream-tripleo-vexxhost-medium
+        label: cloud-centos-9-stream-tripleo-medium
       - name: compute-0
-        label: cloud-centos-9-stream-tripleo-vexxhost
+        label: cloud-centos-9-stream-tripleo
       - name: compute-1
-        label: cloud-centos-9-stream-tripleo-vexxhost
+        label: cloud-centos-9-stream-tripleo
       - name: crc
         label: coreos-crc-extracted-2-39-0-3xl
     groups:
@@ -138,26 +126,6 @@
         nodes:
           - crc
 
-- nodeset:
-    name: centos-9-medium-2x-centos-9-crc-cloud-ocp-4-18-1-3xl-vexxhost
-    nodes:
-      - name: controller
-        label: cloud-centos-9-stream-tripleo-vexxhost-medium
-      - name: compute-0
-        label: cloud-centos-9-stream-tripleo-vexxhost
-      - name: compute-1
-        label: cloud-centos-9-stream-tripleo-vexxhost
-      - name: crc
-        label: crc-cloud-ocp-4-18-1-3xl
-    groups:
-      - name: computes
-        nodes:
-          - compute-0
-          - compute-1
-      - name: ocps
-        nodes:
-          - crc
-
 - nodeset:
     name: centos-9-2x-centos-9-xxl-crc-cloud-ocp-4-18-1-xxl
     nodes:
@@ -215,20 +183,6 @@
         nodes:
           - crc
 
-- nodeset:
-    name: centos-9-medium-crc-cloud-ocp-4-18-1-3xl-vexxhost
-    nodes:
-      - name: controller
-        label: cloud-centos-9-stream-tripleo-vexxhost-medium
-      - name: crc
-        label: crc-cloud-ocp-4-18-1-3xl
-    groups:
-      - name: computes
-        nodes: []
-      - name: ocps
-        nodes:
-          - crc
-
 - nodeset:
     name: centos-9-rhel-9-2-crc-cloud-ocp-4-18-1-3xl
     nodes:
@@ -381,24 +335,6 @@
         nodes:
           - crc
 
-# todo: Remove. Temporal. Needed as the credentials used in ci-bootstrap jobs for IBM don't work
-- nodeset:
-    name: centos-9-medium-centos-9-crc-cloud-ocp-4-18-1-3xl-vexxhost
-    nodes:
-      - name: controller
-        label: cloud-centos-9-stream-tripleo-vexxhost-medium
-      - name: compute-0
-        label: cloud-centos-9-stream-tripleo-vexxhost
-      - name: crc
-        label: crc-cloud-ocp-4-18-1-3xl
-    groups:
-      - name: computes
-        nodes:
-          - compute-0
-      - name: ocps
-        nodes:
-          - crc
-
 - nodeset:
     name: centos-9-crc-2-48-0-6xlarge
     nodes:
@@ -462,26 +398,6 @@
         nodes:
           - crc
 
-- nodeset:
-    name: centos-9-medium-2x-centos-9-crc-cloud-ocp-4-20-1-3xl-vexxhost
-    nodes:
-      - name: controller
-        label: cloud-centos-9-stream-tripleo-vexxhost-medium
-      - name: compute-0
-        label: cloud-centos-9-stream-tripleo-vexxhost
-      - name: compute-1
-        label: cloud-centos-9-stream-tripleo-vexxhost
-      - name: crc
-        label: crc-cloud-ocp-4-20-1-3xl
-    groups:
-      - name: computes
-        nodes:
-          - compute-0
-          - compute-1
-      - name: ocps
-        nodes:
-          - crc
-
 - nodeset:
     name: centos-9-2x-centos-9-xxl-crc-cloud-ocp-4-20-1-xxl
     nodes:
@@ -539,20 +455,6 @@
         nodes:
           - crc
 
-- nodeset:
-    name: centos-9-medium-crc-cloud-ocp-4-20-1-3xl-vexxhost
-    nodes:
-      - name: controller
-        label: cloud-centos-9-stream-tripleo-vexxhost-medium
-      - name: crc
-        label: crc-cloud-ocp-4-20-1-3xl
-    groups:
-      - name: computes
-        nodes: []
-      - name: ocps
-        nodes:
-          - crc
-
 - nodeset:
     name: centos-9-rhel-9-2-crc-cloud-ocp-4-20-1-3xl
     nodes:
@@ -705,24 +607,6 @@
         nodes:
           - crc
 
-# todo: Remove. Temporal. Needed as the credentials used in ci-bootstrap jobs for IBM don't work
-- nodeset:
-    name: centos-9-medium-centos-9-crc-cloud-ocp-4-20-1-3xl-vexxhost
-    nodes:
-      - name: controller
-        label: cloud-centos-9-stream-tripleo-vexxhost-medium
-      - name: compute-0
-        label: cloud-centos-9-stream-tripleo-vexxhost
-      - name: crc
-        label: crc-cloud-ocp-4-20-1-3xl
-    groups:
-      - name: computes
-        nodes:
-          - compute-0
-      - name: ocps
-        nodes:
-          - crc
-
 - nodeset:
     name: centos-9-crc-2-56-0-6xlarge
     nodes:

zuul.d/tcib.yaml

@@ -3,7 +3,7 @@
     name: cifmw-tcib-base
     parent: container-tcib-build-base
     timeout: 3500
-    nodeset: centos-stream-9-vexxhost
+    nodeset: centos-stream-9
     required-projects:
       - opendev.org/zuul/zuul-jobs
       - github.com/openstack-k8s-operators/ci-framework