Merge "Remove unused nodesets"

zuul.d/experimental.yaml

@@ -97,7 +97,7 @@
       - playbooks/osh-infra-upgrade-host.yaml
       - playbooks/osh-infra-deploy-selenium.yaml
     post-run: playbooks/osh-infra-collect-logs.yaml
-    nodeset: openstack-helm-single-node
+    nodeset: openstack-helm-1node-ubuntu_focal
     vars:
       gate_scripts_relative_path: ../openstack-helm-infra
       gate_scripts:
@@ -121,7 +121,7 @@
     pre-run:
       - playbooks/osh-infra-upgrade-host.yaml
       - playbooks/osh-infra-deploy-selenium.yaml
-    nodeset: openstack-helm-single-node
+    nodeset: openstack-helm-1node-ubuntu_focal
     vars:
       gate_scripts_relative_path: ../openstack-helm-infra
       gate_scripts:
@@ -153,7 +153,7 @@
     timeout: 9600
     pre-run: playbooks/osh-infra-upgrade-host.yaml
     post-run: playbooks/osh-infra-collect-logs.yaml
-    nodeset: openstack-helm-single-node
+    nodeset: openstack-helm-1node-ubuntu_focal
     vars:
       osh_params:
         container_distro_name: ubuntu
@@ -188,7 +188,7 @@
       - playbooks/osh-infra-upgrade-host.yaml
       - playbooks/osh-infra-deploy-selenium.yaml
     post-run: playbooks/osh-infra-collect-logs.yaml
-    nodeset: openstack-helm-single-node
+    nodeset: openstack-helm-1node-ubuntu_focal
     vars:
       osh_params:
         container_distro_name: ubuntu
@@ -218,7 +218,7 @@
       - openstack/openstack-helm-infra
       - openstack/openstack-helm
     post-run: playbooks/osh-infra-collect-logs.yaml
-    nodeset: openstack-helm-single-node
+    nodeset: openstack-helm-1node-ubuntu_focal
     vars:
       osh_params:
         openstack_release: xena
@@ -249,7 +249,7 @@
     timeout: 7200
     pre-run: playbooks/osh-infra-upgrade-host.yaml
     post-run: playbooks/osh-infra-collect-logs.yaml
-    nodeset: openstack-helm-single-node
+    nodeset: openstack-helm-1node-ubuntu_focal
     vars:
       gate_scripts_relative_path: ../openstack-helm-infra
       gate_scripts:
@@ -272,7 +272,7 @@
     pre-run:
       - playbooks/osh-infra-upgrade-host.yaml
     post-run: playbooks/osh-infra-collect-logs.yaml
-    nodeset: openstack-helm-single-node
+    nodeset: openstack-helm-1node-ubuntu_focal
     vars:
       osh_params:
         openstack_release: xena
@@ -300,7 +300,7 @@
       - openstack/openstack-helm-infra
       - openstack/openstack-helm
     post-run: playbooks/osh-infra-collect-logs.yaml
-    nodeset: openstack-helm-single-node
+    nodeset: openstack-helm-1node-ubuntu_focal
     vars:
       osh_params:
         openstack_release: xena
@@ -333,7 +333,7 @@
       - playbooks/osh-infra-upgrade-host.yaml
       - playbooks/osh-infra-deploy-selenium.yaml
     post-run: playbooks/osh-infra-collect-logs.yaml
-    nodeset: openstack-helm-single-node
+    nodeset: openstack-helm-1node-ubuntu_focal
     required-projects:
       - openstack/openstack-helm
     vars:
@@ -371,7 +371,7 @@
       - playbooks/osh-infra-upgrade-host.yaml
       - playbooks/osh-infra-deploy-selenium.yaml
     post-run: playbooks/osh-infra-collect-logs.yaml
-    nodeset: openstack-helm-single-node
+    nodeset: openstack-helm-1node-ubuntu_focal
     required-projects:
       - openstack/openstack-helm
     vars:

zuul.d/nodesets.yaml

@@ -1,137 +0,0 @@
----
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- nodeset:
-    name: openstack-helm-single-node
-    nodes:
-      - name: primary
-        label: ubuntu-focal
-    groups:
-      - name: primary
-        nodes:
-          - primary
-
-- nodeset:
-    name: openstack-helm-ubuntu
-    nodes:
-      - name: primary
-        label: ubuntu-focal
-      - name: node-1
-        label: ubuntu-focal
-      - name: node-2
-        label: ubuntu-focal
-    groups:
-      - name: primary
-        nodes:
-          - primary
-      - name: nodes
-        nodes:
-          - node-1
-          - node-2
-
-- nodeset:
-    name: openstack-helm-centos
-    nodes:
-      - name: primary
-        label: centos-7
-      - name: node-1
-        label: centos-7
-      - name: node-2
-        label: centos-7
-    groups:
-      - name: primary
-        nodes:
-          - primary
-      - name: nodes
-        nodes:
-          - node-1
-          - node-2
-
-- nodeset:
-    name: openstack-helm-five-node-ubuntu
-    nodes:
-      - name: primary
-        label: ubuntu-bionic
-      - name: node-1
-        label: ubuntu-bionic
-      - name: node-2
-        label: ubuntu-bionic
-      - name: node-3
-        label: ubuntu-bionic
-      - name: node-4
-        label: ubuntu-bionic
-    groups:
-      - name: primary
-        nodes:
-          - primary
-      - name: nodes
-        nodes:
-          - node-1
-          - node-2
-          - node-3
-          - node-4
-
-- nodeset:
-    name: openstack-helm-five-node-centos
-    nodes:
-      - name: primary
-        label: centos-7
-      - name: node-1
-        label: centos-7
-      - name: node-2
-        label: centos-7
-      - name: node-3
-        label: centos-7
-      - name: node-4
-        label: centos-7
-    groups:
-      - name: primary
-        nodes:
-          - primary
-      - name: nodes
-        nodes:
-          - node-1
-          - node-2
-          - node-3
-          - node-4
-
-- nodeset:
-    name: openstack-helm-single-32GB-node
-    nodes:
-      - name: primary
-        label: ubuntu-bionic-32GB
-    groups:
-      - name: primary
-        nodes:
-          - primary
-
-- nodeset:
-    name: openstack-helm-single-16GB-node
-    nodes:
-      - name: primary
-        label: ubuntu-bionic-expanded
-    groups:
-      - name: primary
-        nodes:
-          - primary
-
-- nodeset:
-    name: openstack-helm-single-expanded
-    nodes:
-      - name: primary
-        label: ubuntu-bionic-expanded-vexxhost
-    groups:
-      - name: primary
-        nodes:
-          - primary
-...