CI: Rename nodesets to reflect 8GB/16GB split

Switch some Ubuntu jobs to 16GB because they hit OOM with proxysql
and running instances in QEMU/KVM.

Rename kolla-ansible-noble to kolla-ansible-ubuntu-noble

Change-Id: Ia0f7d349ce66482cc6063d6002453746ed8854a1
Signed-off-by: Michal Nasiadka <[email protected]>
(cherry picked from commit 3690b53)

Author: mnasiadka

zuul.d/jobs.yaml

@@ -12,7 +12,7 @@
 - job:
     name: kolla-ansible-debian-aarch64
     parent: kolla-ansible-debian
-    nodeset: kolla-ansible-debian-bookworm-aarch64
+    nodeset: kolla-ansible-debian-bookworm-aarch64-8GB
     timeout: 10800
     voting: false
     required-projects:
@@ -21,7 +21,7 @@
 - job:
     name: kolla-ansible-debian-aarch64-podman
     parent: kolla-ansible-debian
-    nodeset: kolla-ansible-debian-bookworm-aarch64
+    nodeset: kolla-ansible-debian-bookworm-aarch64-8GB
     timeout: 10800
     voting: false
     vars:
@@ -66,15 +66,15 @@
 - job:
     name: kolla-ansible-ubuntu
     parent: kolla-ansible-base
-    nodeset: kolla-ansible-noble
+    nodeset: kolla-ansible-ubuntu-noble-16GB
     vars:
       base_distro: ubuntu
       tls_enabled: true
 
 - job:
     name: kolla-ansible-ubuntu-podman
     parent: kolla-ansible-base
-    nodeset: kolla-ansible-noble
+    nodeset: kolla-ansible-ubuntu-noble-16GB
     vars:
       base_distro: ubuntu
       tls_enabled: true
@@ -90,7 +90,7 @@
 - job:
     name: kolla-ansible-ubuntu-kvm
     parent: kolla-ansible-kvm-base
-    nodeset: kolla-ansible-noble-nested-virt
+    nodeset: kolla-ansible-ubuntu-noble-nested-virt
     vars:
       base_distro: ubuntu
 
@@ -104,7 +104,7 @@
 - job:
     name: kolla-ansible-ubuntu-multinode-ipv6
     parent: kolla-ansible-ipv6-base
-    nodeset: kolla-ansible-noble-multi
+    nodeset: kolla-ansible-ubuntu-noble-multi-8GB
     vars:
       base_distro: ubuntu
 
@@ -120,7 +120,7 @@
 - job:
     name: kolla-ansible-ubuntu-cephadm
     parent: kolla-ansible-cephadm-base
-    nodeset: kolla-ansible-noble-multi
+    nodeset: kolla-ansible-ubuntu-noble-multi-16GB
     timeout: 10800
     vars:
       base_distro: ubuntu
@@ -143,7 +143,7 @@
 - job:
     name: kolla-ansible-ubuntu-mariadb
     parent: kolla-ansible-mariadb-base
-    nodeset: kolla-ansible-noble-multi
+    nodeset: kolla-ansible-ubuntu-noble-multi-8GB
     vars:
       base_distro: ubuntu
 
@@ -194,13 +194,13 @@
 - job:
     name: kolla-ansible-debian-upgrade-aarch64
     parent: kolla-ansible-debian-upgrade
-    nodeset: kolla-ansible-debian-bookworm-aarch64
+    nodeset: kolla-ansible-debian-bookworm-aarch64-8GB
     voting: false
 
 - job:
     name: kolla-ansible-ubuntu-upgrade
     parent: kolla-ansible-base
-    nodeset: kolla-ansible-noble
+    nodeset: kolla-ansible-ubuntu-noble-16GB
     timeout: 10800
     vars:
       base_distro: ubuntu
@@ -210,7 +210,7 @@
 - job:
     name: kolla-ansible-ubuntu-slurp-upgrade
     parent: kolla-ansible-base
-    nodeset: kolla-ansible-noble
+    nodeset: kolla-ansible-ubuntu-noble-16GB
     timeout: 9000
     vars:
       base_distro: ubuntu
@@ -242,7 +242,7 @@
 - job:
     name: kolla-ansible-ubuntu-upgrade-cephadm
     parent: kolla-ansible-cephadm-base
-    nodeset: kolla-ansible-noble-multi
+    nodeset: kolla-ansible-ubuntu-noble-multi-16GB
     timeout: 10800
     vars:
       base_distro: ubuntu
@@ -252,7 +252,7 @@
 - job:
     name: kolla-ansible-ubuntu-slurp-upgrade-cephadm
     parent: kolla-ansible-cephadm-base
-    nodeset: kolla-ansible-noble-multi
+    nodeset: kolla-ansible-ubuntu-noble-multi-16GB
     timeout: 9000
     vars:
       base_distro: ubuntu
@@ -282,7 +282,7 @@
 - job:
     name: kolla-ansible-ubuntu-upgrade-ovn
     parent: kolla-ansible-ovn-base
-    nodeset: kolla-ansible-noble-multi
+    nodeset: kolla-ansible-ubuntu-noble-multi-16GB
     timeout: 10800
     vars:
       base_distro: ubuntu
@@ -298,7 +298,7 @@
 - job:
     name: kolla-ansible-ubuntu-bifrost
     parent: kolla-ansible-bifrost-base
-    nodeset: kolla-ansible-noble
+    nodeset: kolla-ansible-ubuntu-noble-8GB
     vars:
       base_distro: ubuntu
 
@@ -312,7 +312,7 @@
 - job:
     name: kolla-ansible-ubuntu-zun
     parent: kolla-ansible-zun-base
-    nodeset: kolla-ansible-noble-multi
+    nodeset: kolla-ansible-ubuntu-noble-multi-8GB
     vars:
       base_distro: ubuntu
 
@@ -340,7 +340,7 @@
 - job:
     name: kolla-ansible-ubuntu-ironic
     parent: kolla-ansible-ironic-base
-    nodeset: kolla-ansible-noble
+    nodeset: kolla-ansible-ubuntu-noble-8GB
     vars:
       base_distro: ubuntu
 
@@ -354,7 +354,7 @@
 - job:
     name: kolla-ansible-ubuntu-magnum
     parent: kolla-ansible-magnum-base
-    nodeset: kolla-ansible-noble
+    nodeset: kolla-ansible-ubuntu-noble-8GB
     vars:
       base_distro: ubuntu
 
@@ -368,14 +368,14 @@
 - job:
     name: kolla-ansible-ubuntu-octavia
     parent: kolla-ansible-octavia-base
-    nodeset: kolla-ansible-noble
+    nodeset: kolla-ansible-ubuntu-noble-16GB
     vars:
       base_distro: ubuntu
 
 - job:
     name: kolla-ansible-ubuntu-masakari
     parent: kolla-ansible-masakari-base
-    nodeset: kolla-ansible-noble-masakari
+    nodeset: kolla-ansible-ubuntu-noble-masakari-8GB
     vars:
       base_distro: ubuntu
 
@@ -389,7 +389,7 @@
 - job:
     name: kolla-ansible-ubuntu-cells
     parent: kolla-ansible-cells-base
-    nodeset: kolla-ansible-noble-multi
+    nodeset: kolla-ansible-ubuntu-noble-multi-16GB
     vars:
       base_distro: ubuntu
 
@@ -417,14 +417,14 @@
 - job:
     name: kolla-ansible-ubuntu-ovn
     parent: kolla-ansible-ovn-base
-    nodeset: kolla-ansible-noble-multi
+    nodeset: kolla-ansible-ubuntu-noble-multi-16GB
     vars:
       base_distro: ubuntu
 
 - job:
     name: kolla-ansible-ubuntu-lets-encrypt
     parent: kolla-ansible-lets-encrypt-base
-    nodeset: kolla-ansible-noble-multi
+    nodeset: kolla-ansible-ubuntu-noble-multi-16GB
     vars:
       base_distro: ubuntu
 
@@ -445,7 +445,7 @@
 - job:
     name: kolla-ansible-ubuntu-prometheus-opensearch
     parent: kolla-ansible-prometheus-opensearch-base
-    nodeset: kolla-ansible-noble
+    nodeset: kolla-ansible-ubuntu-noble-8GB
     vars:
       base_distro: ubuntu
 
@@ -460,7 +460,7 @@
 - job:
     name: kolla-ansible-ubuntu-prometheus-opensearch-upgrade
     parent: kolla-ansible-prometheus-opensearch-base
-    nodeset: kolla-ansible-noble
+    nodeset: kolla-ansible-ubuntu-noble-8GB
     vars:
       base_distro: ubuntu
       is_upgrade: yes
@@ -475,7 +475,7 @@
 - job:
     name: kolla-ansible-ubuntu-venus
     parent: kolla-ansible-venus-base
-    nodeset: kolla-ansible-noble
+    nodeset: kolla-ansible-ubuntu-noble-8GB
     vars:
       base_distro: ubuntu
 
@@ -497,15 +497,15 @@
 - job:
     name: kolla-ansible-ubuntu-haproxy-fqdn
     parent: kolla-ansible-haproxy-base
-    nodeset: kolla-ansible-noble
+    nodeset: kolla-ansible-ubuntu-noble-8GB
     vars:
       base_distro: ubuntu
       tls_enabled: true
 
 - job:
     name: kolla-ansible-ubuntu-skyline
     parent: kolla-ansible-skyline-base
-    nodeset: kolla-ansible-noble
+    nodeset: kolla-ansible-ubuntu-noble-8GB
     vars:
       base_distro: ubuntu
 
@@ -519,7 +519,7 @@
 - job:
     name: kolla-ansible-ubuntu-skyline-sso
     parent: kolla-ansible-skyline-sso-base
-    nodeset: kolla-ansible-noble
+    nodeset: kolla-ansible-ubuntu-noble-8GB
     vars:
       base_distro: ubuntu
 
@@ -547,14 +547,14 @@
 - job:
     name: kolla-ansible-ubuntu-container-engine-migration
     parent: kolla-ansible-container-engine-migration-base
-    nodeset: kolla-ansible-noble
+    nodeset: kolla-ansible-ubuntu-noble-8GB
     vars:
       base_distro: ubuntu
 
 - job:
     name: kolla-ansible-ubuntu-container-engine-migration-multinode
     parent: kolla-ansible-container-engine-migration-base
-    nodeset: kolla-ansible-noble-multi
+    nodeset: kolla-ansible-ubuntu-noble-multi-8GB
     vars:
       base_distro: ubuntu
 

zuul.d/nodesets.yaml

@@ -6,10 +6,10 @@
         label: centos-9-stream
 
 - nodeset:
-    name: kolla-ansible-debian-bookworm
+    name: kolla-ansible-debian-bookworm-8GB
     nodes:
       - name: primary
-        label: debian-bookworm
+        label: debian-bookworm-8GB
 
 - nodeset:
     name: kolla-ansible-debian-bookworm-16GB
@@ -18,26 +18,32 @@
         label: debian-bookworm-16GB
 
 - nodeset:
-    name: kolla-ansible-debian-bookworm-aarch64
+    name: kolla-ansible-debian-bookworm-aarch64-8GB
     nodes:
       - name: primary
-        label: debian-bookworm-arm64
+        label: debian-bookworm-arm64-8GB
 
 - nodeset:
-    name: kolla-ansible-noble
+    name: kolla-ansible-ubuntu-noble-8GB
     nodes:
       - name: primary
-        label: ubuntu-noble
+        label: ubuntu-noble-8GB
 
 - nodeset:
-    name: kolla-ansible-debian-bookworm-multi
+    name: kolla-ansible-ubuntu-noble-16GB
     nodes:
       - name: primary
-        label: debian-bookworm
+        label: ubuntu-noble-16GB
+
+- nodeset:
+    name: kolla-ansible-debian-bookworm-multi-8GB
+    nodes:
+      - name: primary
+        label: debian-bookworm-8GB
       - name: secondary1
-        label: debian-bookworm
+        label: debian-bookworm-8GB
       - name: secondary2
-        label: debian-bookworm
+        label: debian-bookworm-8GB
 
 - nodeset:
     name: kolla-ansible-debian-bookworm-multi-16GB
@@ -56,14 +62,24 @@
         label: rockylinux-9
 
 - nodeset:
-    name: kolla-ansible-noble-multi
+    name: kolla-ansible-ubuntu-noble-multi-8GB
+    nodes:
+      - name: primary
+        label: ubuntu-noble-8GB
+      - name: secondary1
+        label: ubuntu-noble-8GB
+      - name: secondary2
+        label: ubuntu-noble-8GB
+
+- nodeset:
+    name: kolla-ansible-ubuntu-noble-multi-16GB
     nodes:
       - name: primary
-        label: ubuntu-noble
+        label: ubuntu-noble-16GB
       - name: secondary1
-        label: ubuntu-noble
+        label: ubuntu-noble-16GB
       - name: secondary2
-        label: ubuntu-noble
+        label: ubuntu-noble-16GB
 
 - nodeset:
     name: kolla-ansible-rocky9-multi
@@ -76,10 +92,10 @@
         label: rockylinux-9
 
 - nodeset:
-    name: kolla-ansible-noble-nested-virt
+    name: kolla-ansible-ubuntu-noble-nested-virt
     nodes:
       - name: primary
-        label: nested-virt-ubuntu-noble
+        label: ubuntu-noble-nested-virt-8GB
 
 - nodeset:
     name: kolla-ansible-rocky9-nested-virt
@@ -88,16 +104,16 @@
         label: nested-virt-centos-9-stream
 
 - nodeset:
-    name: kolla-ansible-noble-masakari
+    name: kolla-ansible-ubuntu-noble-masakari-8GB
     nodes:
       - name: primary
-        label: ubuntu-noble
+        label: ubuntu-noble-8GB
       - name: secondary
-        label: ubuntu-noble
+        label: ubuntu-noble-8GB
       - name: ternary1
-        label: ubuntu-noble
+        label: ubuntu-noble-8GB
       - name: ternary2
-        label: ubuntu-noble
+        label: ubuntu-noble-8GB
 
 - nodeset:
     name: kolla-ansible-rocky9-masakari