srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2025-01-10 11:03:08 +00:00
Code Issues Releases Activity

Use qemu cpu "host" for most tests to avoid #2329581

Browse Source 
Using qemu CPU "host" (match host CPU features) seems to avoid
tests. We'll keep "Nehalem" as the CPU for one test so we will
catch inadvertent baseline bumps.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2025-01-02 13:43:57 -08:00
parent a0903c995c
commit da61368f0d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
templates-updates.fif.json
View File

@ -380,8 +380,7 @@
"+START_AFTER_TEST": "%LIVE_BUILD_TEST%@%ARCH_BASE_MACHINE%", "+START_AFTER_TEST": "%LIVE_BUILD_TEST%@%ARCH_BASE_MACHINE%",
"INSTALL": "1", "INSTALL": "1",
"ISO": "Fedora-%SUBVARIANT%-Live-%ARCH%-%ADVISORY_OR_TASK%.iso", "ISO": "Fedora-%SUBVARIANT%-Live-%ARCH%-%ADVISORY_OR_TASK%.iso",
"QEMURAM": "4096", "QEMURAM": "4096"
"RETRY": "5"
} }
}, },
"install_default_update_netinst": { "install_default_update_netinst": {

9
templates.fif.json
View File

@ -5,7 +5,7 @@
"settings": { "settings": {
"ARCH_BASE_MACHINE": "64bit", "ARCH_BASE_MACHINE": "64bit",
"PART_TABLE_TYPE": "mbr", "PART_TABLE_TYPE": "mbr",
"QEMUCPU": "Nehalem", "QEMUCPU": "host",
"QEMUCPUS": "2", "QEMUCPUS": "2",
"QEMURAM": "3072", "QEMURAM": "3072",
"QEMU_VIDEO_DEVICE": "virtio-vga", "QEMU_VIDEO_DEVICE": "virtio-vga",
@ -61,7 +61,7 @@
"INSECURE_PFLASH_CODE": "/usr/share/edk2/ovmf/OVMF_CODE.fd", "INSECURE_PFLASH_CODE": "/usr/share/edk2/ovmf/OVMF_CODE.fd",
"INSECURE_PFLASH_VARS": "/usr/share/edk2/ovmf/OVMF_VARS.fd", "INSECURE_PFLASH_VARS": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
"PART_TABLE_TYPE": "gpt", "PART_TABLE_TYPE": "gpt",
"QEMUCPU": "Nehalem", "QEMUCPU": "host",
"QEMUCPUS": "2", "QEMUCPUS": "2",
"QEMURAM": "3072", "QEMURAM": "3072",
"QEMU_VIDEO_DEVICE": "virtio-vga", "QEMU_VIDEO_DEVICE": "virtio-vga",
@ -86,7 +86,7 @@
"flavor": "BaseOS-boot-iso", "flavor": "BaseOS-boot-iso",
"settings": { "settings": {
"DEPLOY_UPLOAD_TEST": "install_default_upload", "DEPLOY_UPLOAD_TEST": "install_default_upload",
"+QEMUCPU": "Haswell", "+QEMUCPU": "host",
"TEST_TARGET": "ISO" "TEST_TARGET": "ISO"
}, },
"version": "*" "version": "*"
@ -97,7 +97,7 @@
"flavor": "BaseOS-dvd-iso", "flavor": "BaseOS-dvd-iso",
"settings": { "settings": {
"DEPLOY_UPLOAD_TEST": "install_default_upload", "DEPLOY_UPLOAD_TEST": "install_default_upload",
"+QEMUCPU": "Haswell", "+QEMUCPU": "host",
"TEST_TARGET": "ISO" "TEST_TARGET": "ISO"
}, },
"version": "*" "version": "*"
@ -659,6 +659,7 @@
"settings": { "settings": {
"BOOTFROM": "c", "BOOTFROM": "c",
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2", "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"QEMUCPU": "Nehalem",
"STARTSTOP": "true", "STARTSTOP": "true",
"START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%" "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
} }