aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartosz Bezak <bartosz@stackhpc.com>2025-10-29 15:42:24 +0100
committerBartosz Bezak <bartosz@stackhpc.com>2025-11-03 07:47:41 +0000
commitcf02acb1a5b370fd4255073c26140646de324eaf (patch)
tree201378f8e2312ffb29cd6464f8d4b2268f82cb78
parent6dff5d5580f066c0568b1ba19dc0dc717cd4f81e (diff)
downloadkolla-ansible-cf02acb1a5b370fd4255073c26140646de324eaf.tar.gz
kolla-ansible-cf02acb1a5b370fd4255073c26140646de324eaf.zip
CI: ironic - stop using tinyipa
Tinyipa was dropped [1]. Increase the Tenks nodes to 3 GiB ram and force `cpu_mode: maximum` so the CentOS Stream IPA no longer errors with "Fatal glibc error: CPU does not support x86-64-v2" [1] https://review.opendev.org/c/openstack/ironic-python-agent-builder/+/962490 Change-Id: If27163c55375338d9347afff0d2b9c19419fe06a Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
-rw-r--r--tests/run.yml6
-rw-r--r--tests/templates/tenks-deploy-config.yml.j28
-rw-r--r--zuul.d/scenarios/ironic.yaml4
3 files changed, 9 insertions, 9 deletions
diff --git a/tests/run.yml b/tests/run.yml
index d421c3e7a..f050977a8 100644
--- a/tests/run.yml
+++ b/tests/run.yml
@@ -231,12 +231,12 @@
- name: Download Ironic Python Agent (IPA) images
get_url:
- url: "https://tarballs.opendev.org/openstack/ironic-python-agent/tinyipa/files/{{ item.src }}"
+ url: "https://tarballs.opendev.org/openstack/ironic-python-agent-builder/dib/files/{{ item.src }}"
dest: "/etc/kolla/config/ironic/{{ item.dest }}"
with_items:
- - src: "tinyipa-{{ zuul.branch | replace('/', '-') }}.gz"
+ - src: "ipa-centos9-{{ zuul.branch | replace('/', '-') }}.initramfs"
dest: ironic-agent.initramfs
- - src: "tinyipa-{{ zuul.branch | replace('/', '-') }}.vmlinuz"
+ - src: "ipa-centos9-{{ zuul.branch | replace('/', '-') }}.kernel"
dest: ironic-agent.kernel
when: scenario == "ironic"
diff --git a/tests/templates/tenks-deploy-config.yml.j2 b/tests/templates/tenks-deploy-config.yml.j2
index 8aff89eef..6d2c409c4 100644
--- a/tests/templates/tenks-deploy-config.yml.j2
+++ b/tests/templates/tenks-deploy-config.yml.j2
@@ -3,7 +3,7 @@
node_types:
type0:
- memory_mb: 1024
+ memory_mb: 3072
vcpus: 1
volumes:
# There is a minimum disk space capacity requirement of 4GiB when using Ironic Python Agent:
@@ -12,9 +12,9 @@ node_types:
physical_networks:
- physnet1
console_log_enabled: true
- # We seem to hit issues with missing cpu features in CI as a result of using host-model, e.g:
- # https://zuul.opendev.org/t/openstack/build/02c33ab51664419a88a5a54ad22852a9/log/primary/system_logs/libvirt/qemu/tk0.txt.gz#38
- cpu_mode:
+ # NOTE(bbezak): Force QEMU to expose x86-64‑v2 features, so the Centos Stream IPA
+ # doesn’t fail with "Fatal glibc error: CPU does not support x86-64-v2".
+ cpu_mode: maximum
specs:
- type: type0
count: 1
diff --git a/zuul.d/scenarios/ironic.yaml b/zuul.d/scenarios/ironic.yaml
index b1fa44906..ee2000557 100644
--- a/zuul.d/scenarios/ironic.yaml
+++ b/zuul.d/scenarios/ironic.yaml
@@ -40,12 +40,12 @@
- job:
name: kolla-ansible-ubuntu-noble-ironic
parent: kolla-ansible-ironic-base
- nodeset: kolla-ansible-ubuntu-noble-8GB
+ nodeset: kolla-ansible-ubuntu-noble-16GB
- job:
name: kolla-ansible-ubuntu-noble-ironic-upgrade
parent: kolla-ansible-ubuntu-noble-ironic
- nodeset: kolla-ansible-ubuntu-noble-8GB
+ nodeset: kolla-ansible-ubuntu-noble-16GB
- project-template:
name: kolla-ansible-scenario-ironic