CI: move aarch64 jobs to 16G ram nodes

Change-Id: I3e2fcee68efeae8c7ea9428156b63b9a9cfc1be0
Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>

3 files changed, 54 insertions, 5 deletions

diff --git a/roles/kolla-ansible-tempest/tasks/main.yml b/roles/kolla-ansible-tempest/tasks/main.yml
index f2397a5d5..6fa5df576 100644
--- a/roles/kolla-ansible-tempest/tasks/main.yml
+++ b/roles/kolla-ansible-tempest/tasks/main.yml
@@ -31,6 +31,25 @@
       >/tmp/logs/ansible/test-init-tempest-discover 2>&1
   changed_when: false
 
+# NOTE(bbezak): aarch64 Tempest guests may miss config-drive with the
+# default SCSI model, so force virtio-scsi for CirrOS.
+- name: Set Tempest image properties on aarch64
+  vars:
+    ansible_python_interpreter: "{{ kolla_ansible_venv_path }}/bin/python"
+    image_name: "cirros-{{ kolla_ansible_tempest_cirros_ver }}-aarch64-disk.img"
+  openstack.cloud.image:
+    cloud: "kolla-admin"
+    name: "{{ item }}"
+    visibility: public
+    properties:
+      hw_scsi_model: virtio-scsi
+  environment:
+    OS_CLIENT_CONFIG_FILE: "/etc/kolla/clouds.yaml"
+  loop:
+    - "{{ image_name }}"
+    - "{{ image_name }}_alt"
+  when: ansible_architecture == 'aarch64'
+
 - name: Run tempest tests
   environment:
     OS_LOG_CAPTURE: "1"
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index d143e4ae7..da11f4f7c 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -12,6 +12,18 @@
         label: centos-10-stream-arm64-8GB
 
 - nodeset:
+    name: kolla-ansible-centos-10s-aarch64-16GB
+    nodes:
+      - name: primary
+        label: centos-10-stream-arm64-16GB
+
+- nodeset:
+    name: kolla-ansible-debian-bookworm-aarch64-16GB
+    nodes:
+      - name: primary
+        label: debian-bookworm-arm64-16GB
+
+- nodeset:
     name: kolla-ansible-debian-trixie-8GB
     nodes:
       - name: primary
@@ -30,6 +42,12 @@
         label: debian-trixie-arm64-8GB
 
 - nodeset:
+    name: kolla-ansible-debian-trixie-aarch64-16GB
+    nodes:
+      - name: primary
+        label: debian-trixie-arm64-16GB
+
+- nodeset:
     name: kolla-ansible-debian-trixie-masakari-8GB
     nodes:
       - name: primary
@@ -124,6 +142,12 @@
         label: ubuntu-noble-16GB
 
 - nodeset:
+    name: kolla-ansible-ubuntu-noble-aarch64-16GB
+    nodes:
+      - name: primary
+        label: ubuntu-noble-arm64-16GB
+
+- nodeset:
     name: kolla-ansible-ubuntu-noble-multi-8GB
     nodes:
       - name: primary
diff --git a/zuul.d/scenarios/aio.yaml b/zuul.d/scenarios/aio.yaml
index c731f4787..80b91cf03 100644
--- a/zuul.d/scenarios/aio.yaml
+++ b/zuul.d/scenarios/aio.yaml
@@ -23,7 +23,7 @@
 - job:
     name: kolla-ansible-centos-10s-aarch64
     parent: kolla-ansible-centos-10s
-    nodeset: kolla-ansible-centos-10s-aarch64-8GB
+    nodeset: kolla-ansible-centos-10s-aarch64-16GB
 
 - job:
     name: kolla-ansible-debian-trixie
@@ -33,7 +33,7 @@
 - job:
     name: kolla-ansible-debian-trixie-aarch64
     parent: kolla-ansible-debian-trixie
-    nodeset: kolla-ansible-debian-trixie-aarch64-8GB
+    nodeset: kolla-ansible-debian-trixie-aarch64-16GB
     timeout: 10800
     vars:
       kolla_build_images: true
@@ -42,7 +42,7 @@
 - job:
     name: kolla-ansible-debian-trixie-aarch64-podman
     parent: kolla-ansible-debian-trixie-aarch64
-    nodeset: kolla-ansible-debian-trixie-aarch64-8GB
+    nodeset: kolla-ansible-debian-trixie-aarch64-16GB
     timeout: 10800
     vars:
       container_engine: podman
@@ -65,7 +65,7 @@
 - job:
     name: kolla-ansible-debian-bookworm-aarch64-upgrade
     parent: kolla-ansible-debian-bookworm-upgrade
-    nodeset: kolla-ansible-debian-bookworm-aarch64-8GB
+    nodeset: kolla-ansible-debian-bookworm-aarch64-16GB
     voting: false
 
 - job:
@@ -104,6 +104,12 @@
     nodeset: kolla-ansible-ubuntu-noble-16GB
 
 - job:
+    name: kolla-ansible-ubuntu-noble-aarch64
+    parent: kolla-ansible-ubuntu-noble
+    nodeset: kolla-ansible-ubuntu-noble-aarch64-16GB
+    voting: false
+
+- job:
     name: kolla-ansible-ubuntu-noble-podman
     parent: kolla-ansible-ubuntu-noble
     nodeset: kolla-ansible-ubuntu-noble-16GB
@@ -140,10 +146,10 @@
         - kolla-ansible-ubuntu-noble-upgrade
     check-arm64:
       jobs:
-        - kolla-ansible-centos-10s-aarch64
         - kolla-ansible-debian-trixie-aarch64
         - kolla-ansible-debian-trixie-aarch64-podman
         - kolla-ansible-debian-bookworm-aarch64-upgrade
+        - kolla-ansible-ubuntu-noble-aarch64
     gate:
       jobs:
         - kolla-ansible-debian-bookworm-upgrade