openstack/kolla-ansible
Code Issues Proposed changes

CI: set cpu_model to Nehalem for kvm jobs

Browse Source 
RHEL 9 are being compiled for the x86_64-v2 architecture which is
newer than the qemu default of qemu64. Nehalem is apparently the
oldest model that works for x86_64-v2 and is expected to work on
Intel and AMD cpus with kvm or qemu.

See devstack change [0].

[0]: Ibd6e11b59f3c8655bc60ace7383a08458b2177f2

Change-Id: Ia0a3620bae21984933756331bb5937ce681d3237
This commit is contained in:
Michal Nasiadka 2022-10-14 12:22:22 +02:00 committed by Marcin Juszkiewicz
parent bede68572a
commit aa1b19c3c0
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/templates/nova-compute-overrides.j2
View File

@ -3,4 +3,13 @@
cpu_mode=custom cpu_mode=custom
# cpu_model=max fails to boot multiple images with QEMU 7.0 and -M virt (works with "-M virt-6.2") # cpu_model=max fails to boot multiple images with QEMU 7.0 and -M virt (works with "-M virt-6.2")
cpu_model=cortex-a72 cpu_model=cortex-a72
{% elif ansible_architecture == 'x86_64' %}
# RHEL 9 are being compiled for the x86_64-v2 architecture which is
# newer than the qemu default of qemu64. Nehalem is apparently the
# oldest model that works for x86_64-v2 and is expected to work on
# Intel and AMD cpus with kvm or qemu.
{% if virt_type == 'kvm' %}
cpu_mode=custom
cpu_model=Nehalem
{% endif %}
{% endif %} {% endif %}

1
zuul.d/base.yaml
View File

@ -52,6 +52,7 @@
voting: false voting: false
files: files:
- ^ansible/roles/(nova-cell)/ - ^ansible/roles/(nova-cell)/
- ^tests/templates/nova-compute-overrides.j2
vars: vars:
virt_type: kvm virt_type: kvm