srbala
/
os-autoinst-distri-fedora
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
1
0
Fork 0
Code Issues Releases Activity

templates: Drop special-casing of Cloud_Base on Rawhide 

This was from F35 era when Cloud_Base worked on UEFI on Rawhide
but not F33 or F34. Now F34 is EOL, we can just follow the same
policy for every release (run two tests on both BIOS and UEFI,
the rest only on UEFI).

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2022-11-03 09:18:28 -07:00
parent 4c49a94a66
commit 84adf7262a
1 changed files with 8 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
templates.fif.json
View File

@ -130,20 +130,6 @@
},
"version": "*"
},
"fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide": {
"arch": "x86_64",
"distri": "fedora",
"flavor": "Cloud_Base-qcow2-qcow2",
"settings": {
"BOOTFROM": "c",
"DEPLOY_UPLOAD_TEST": "",
"+HDD_1": "%HDD_2%",
"ISO": "cloudinit.iso",
"ROOT_PASSWORD": "weakpassword",
"TEST_TARGET": "HDD_1"
},
"version": "Rawhide"
},
"fedora-CoreOS-colive-iso-x86_64-*": {
"arch": "x86_64",
"distri": "fedora",
@ -460,14 +446,6 @@
"machine": "64bit",
"product": "fedora-Cloud_Base-qcow2-qcow2-x86_64-*"
},
"fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-64bit": {
"machine": "64bit",
"product": "fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide"
},
"fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-uefi": {
"machine": "uefi",
"product": "fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide"
},
"fedora-CoreOS-colive-iso-x86_64-*-64bit": {
"machine": "64bit",
"product": "fedora-CoreOS-colive-iso-x86_64-*"
@ -649,8 +627,7 @@
"fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 20,
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 20,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 20,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-64bit": 20,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-uefi": 20,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 20,
"fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
"fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
"fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 20,
@ -682,8 +659,7 @@
"profiles": {
"fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 20,
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 20,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 20,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-uefi": 20,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 20,
"fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
"fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
"fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 20,
@ -715,8 +691,7 @@
"profiles": {
"fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 20,
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 20,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 20,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-uefi": 20,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 20,
"fedora-KDE-live-iso-x86_64-*-64bit": 22,
"fedora-Minimal-raw_xz-raw.xz-arm-*-ARM": 22,
"fedora-Minimal-raw_xz-raw.xz-aarch64-*-aarch64": 22,
@ -743,8 +718,7 @@
"profiles": {
"fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-uefi": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 40,
"fedora-KDE-live-iso-x86_64-*-64bit": 42,
"fedora-Minimal-raw_xz-raw.xz-arm-*-ARM": 42,
"fedora-Minimal-raw_xz-raw.xz-aarch64-*-aarch64": 42,
@ -772,8 +746,7 @@
"fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-64bit": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-uefi": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 40,
"fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
"fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 40,
"fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40,
@ -805,8 +778,7 @@
"profiles": {
"fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-uefi": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 40,
"fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
"fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 40,
"fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40,
@ -838,8 +810,7 @@
"profiles": {
"fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-uefi": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 40,
"fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
"fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 40,
"fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40,
@ -871,8 +842,7 @@
"profiles": {
"fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 30,
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 30,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 30,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-Rawhide-uefi": 30
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 30
},
"settings": {
"POSTINSTALL": "autocloud"