srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2025-07-27 04:15:45 +00:00
Code Issues Releases Activity

Use fifloader ProfileGroups in our templates

Browse Source 
This reduces another chunk of duplication in the templates by
using ProfileGroups. It should produce *mostly* the same results
as before, but some inconsistencies are intentionally fixed (like
some desktop tests not running on
fedora-Workstation-upgrade-x86_64-*-64bit), and several priorities
change. It's not really possible to make all priorities match
exactly, so I took the chance to make some more consistent with
our original intent all those years ago: tests related to Basic
criteria should be 20 on blocking images, Beta criteria are 30,
and Final criteria are 40.

We're also consistent about running all the same tests on osbuild
and non-osbuild lives.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2025-05-15 17:22:06 -07:00
parent 900629606b
commit 81b5a1332d
2 changed files with 433 additions and 883 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

193
templates-updates.fif.json
View File

@ -233,12 +233,33 @@
"product": "fedora-updates-workstation-x86_64-*" "product": "fedora-updates-workstation-x86_64-*"
} }
}, },
"ProfileGroups": {
"updates-container-3arch": {
"fedora-updates-container-aarch64-*-aarch64": 0,
"fedora-updates-container-ppc64le-*-ppc64le": 0,
"fedora-updates-container-x86_64-*-64bit": 0
},
"updates-server-2arch": {
"fedora-updates-server-ppc64le-*-ppc64le": 0,
"fedora-updates-server-x86_64-*-64bit": 0
},
"updates-server-3arch": {
"updates-server-2arch": 0,
"fedora-updates-server-aarch64-*-aarch64": 0
},
"updates-desktops": {
"fedora-updates-kde-x86_64-*-64bit": 0,
"fedora-updates-workstation-x86_64-*-64bit": 0
},
"updates-base-tests": {
"updates-server-3arch": 0,
"updates-desktops": 0
}
},
"TestSuites": { "TestSuites": {
"advisory_boot": { "advisory_boot": {
"profiles": { "profile_groups": {
"fedora-updates-server-aarch64-*-aarch64": 5, "updates-server-3arch": 5
"fedora-updates-server-ppc64le-*-ppc64le": 5,
"fedora-updates-server-x86_64-*-64bit": 5
}, },
"settings": { "settings": {
"ADVISORY_BOOT_TEST": "1", "ADVISORY_BOOT_TEST": "1",
@ -248,69 +269,43 @@
} }
}, },
"base_selinux": { "base_selinux": {
"profiles": { "profile_groups": {
"fedora-updates-kde-x86_64-*-64bit": 5, "updates-base-tests": 5
"fedora-updates-server-aarch64-*-aarch64": 5,
"fedora-updates-server-ppc64le-*-ppc64le": 5,
"fedora-updates-server-x86_64-*-64bit": 5,
"fedora-updates-workstation-x86_64-*-64bit": 5
} }
}, },
"base_service_manipulation": { "base_service_manipulation": {
"profiles": { "profile_groups": {
"fedora-updates-kde-x86_64-*-64bit": 5, "updates-base-tests": 5
"fedora-updates-server-aarch64-*-aarch64": 5,
"fedora-updates-server-ppc64le-*-ppc64le": 5,
"fedora-updates-server-x86_64-*-64bit": 5,
"fedora-updates-workstation-x86_64-*-64bit": 5
} }
}, },
"base_services_start": { "base_services_start": {
"profiles": { "profile_groups": {
"fedora-updates-kde-x86_64-*-64bit": 5, "updates-base-tests": 5
"fedora-updates-server-aarch64-*-aarch64": 5,
"fedora-updates-server-ppc64le-*-ppc64le": 5,
"fedora-updates-server-x86_64-*-64bit": 5,
"fedora-updates-workstation-x86_64-*-64bit": 5
} }
}, },
"base_update_cli": { "base_update_cli": {
"profiles": { "profile_groups": {
"fedora-updates-kde-x86_64-*-64bit": 5, "updates-base-tests": 5
"fedora-updates-server-aarch64-*-aarch64": 5,
"fedora-updates-server-ppc64le-*-ppc64le": 5,
"fedora-updates-server-x86_64-*-64bit": 5,
"fedora-updates-workstation-x86_64-*-64bit": 5
} }
}, },
"base_reboot_unmount": { "base_reboot_unmount": {
"profiles": { "profile_groups": {
"fedora-updates-kde-x86_64-*-64bit": 5, "updates-base-tests": 5
"fedora-updates-server-aarch64-*-aarch64": 5,
"fedora-updates-server-ppc64le-*-ppc64le": 5,
"fedora-updates-server-x86_64-*-64bit": 5,
"fedora-updates-workstation-x86_64-*-64bit": 5
} }
}, },
"base_system_logging": { "base_system_logging": {
"profiles": { "profile_groups": {
"fedora-updates-kde-x86_64-*-64bit": 5, "updates-base-tests": 5
"fedora-updates-server-aarch64-*-aarch64": 5,
"fedora-updates-server-ppc64le-*-ppc64le": 5,
"fedora-updates-server-x86_64-*-64bit": 5,
"fedora-updates-workstation-x86_64-*-64bit": 5
} }
}, },
"desktop_background": { "desktop_background": {
"profiles": { "profile_groups": {
"fedora-updates-kde-x86_64-*-64bit": 5, "updates-desktops": 5
"fedora-updates-workstation-x86_64-*-64bit": 5
} }
}, },
"desktop_browser": { "desktop_browser": {
"profiles": { "profile_groups": {
"fedora-updates-kde-x86_64-*-64bit": 5, "updates-desktops": 5
"fedora-updates-workstation-x86_64-*-64bit": 5
} }
}, },
"desktop_keyring": { "desktop_keyring": {
@ -319,27 +314,23 @@
} }
}, },
"desktop_printing": { "desktop_printing": {
"profiles": { "profile_groups": {
"fedora-updates-kde-x86_64-*-64bit": 5, "updates-desktops": 5
"fedora-updates-workstation-x86_64-*-64bit": 5
} }
}, },
"desktop_printing_builtin": { "desktop_printing_builtin": {
"profiles": { "profile_groups": {
"fedora-updates-kde-x86_64-*-64bit": 5, "updates-desktops": 5
"fedora-updates-workstation-x86_64-*-64bit": 5
} }
}, },
"desktop_terminal": { "desktop_terminal": {
"profiles": { "profile_groups": {
"fedora-updates-kde-x86_64-*-64bit": 5, "updates-desktops": 5
"fedora-updates-workstation-x86_64-*-64bit": 5
} }
}, },
"desktop_update_graphical": { "desktop_update_graphical": {
"profiles": { "profile_groups": {
"fedora-updates-kde-x86_64-*-64bit": 5, "updates-desktops": 5
"fedora-updates-workstation-x86_64-*-64bit": 5
} }
}, },
"install_default_update_live": { "install_default_update_live": {
@ -347,7 +338,8 @@
"fedora-updates-kde-live-iso-x86_64-*-bios": 5, "fedora-updates-kde-live-iso-x86_64-*-bios": 5,
"fedora-updates-kde-live-iso-x86_64-*-64bit": 5, "fedora-updates-kde-live-iso-x86_64-*-64bit": 5,
"fedora-updates-workstation-live-iso-x86_64-*-bios": 5, "fedora-updates-workstation-live-iso-x86_64-*-bios": 5,
"fedora-updates-workstation-live-iso-x86_64-*-64bit": 5 "fedora-updates-workstation-live-iso-x86_64-*-64bit": 5,
"fedora-updates-workstation-live-iso-x86_64-*-bios": 5
}, },
"settings": { "settings": {
"+START_AFTER_TEST": "kiwi_build@%ARCH_BASE_MACHINE%", "+START_AFTER_TEST": "kiwi_build@%ARCH_BASE_MACHINE%",
@ -449,41 +441,33 @@
} }
}, },
"podman": { "podman": {
"profiles": { "profile_groups": {
"fedora-updates-container-aarch64-*-aarch64": 5, "updates-container-3arch": 5
"fedora-updates-container-ppc64le-*-ppc64le": 5,
"fedora-updates-container-x86_64-*-64bit": 5
} }
}, },
"podman_client": { "podman_client": {
"profiles": { "profile_groups": {
"fedora-updates-container-aarch64-*-aarch64": 5, "updates-container-3arch": 5
"fedora-updates-container-ppc64le-*-ppc64le": 5,
"fedora-updates-container-x86_64-*-64bit": 5
} }
}, },
"realmd_join_cockpit": { "realmd_join_cockpit": {
"profiles": { "profile_groups": {
"fedora-updates-server-ppc64le-*-ppc64le": 5, "updates-server-2arch": 5
"fedora-updates-server-x86_64-*-64bit": 5
} }
}, },
"realmd_join_cockpit_ad": { "realmd_join_cockpit_ad": {
"profiles": { "profile_groups": {
"fedora-updates-server-ppc64le-*-ppc64le": 5, "updates-server-2arch": 5
"fedora-updates-server-x86_64-*-64bit": 5
} }
}, },
"realmd_join_sssd": { "realmd_join_sssd": {
"profiles": { "profile_groups": {
"fedora-updates-server-ppc64le-*-ppc64le": 5, "updates-server-2arch": 5
"fedora-updates-server-x86_64-*-64bit": 5
} }
}, },
"realmd_join_sssd_ad": { "realmd_join_sssd_ad": {
"profiles": { "profile_groups": {
"fedora-updates-server-ppc64le-*-ppc64le": 5, "updates-server-2arch": 5
"fedora-updates-server-x86_64-*-64bit": 5
} }
}, },
"rpmostree_overlay": { "rpmostree_overlay": {
@ -497,34 +481,28 @@
} }
}, },
"server_cockpit_basic": { "server_cockpit_basic": {
"profiles": { "profile_groups": {
"fedora-updates-server-ppc64le-*-ppc64le": 5, "updates-server-2arch": 5
"fedora-updates-server-x86_64-*-64bit": 5
} }
}, },
"server_cockpit_default": { "server_cockpit_default": {
"profiles": { "profile_groups": {
"fedora-updates-server-ppc64le-*-ppc64le": 5, "updates-server-2arch": 5
"fedora-updates-server-x86_64-*-64bit": 5
} }
}, },
"server_cockpit_updates": { "server_cockpit_updates": {
"profiles": { "profile_groups": {
"fedora-updates-server-ppc64le-*-ppc64le": 5, "updates-server-2arch": 5
"fedora-updates-server-x86_64-*-64bit": 5
} }
}, },
"server_database_client": { "server_database_client": {
"profiles": { "profile_groups": {
"fedora-updates-server-ppc64le-*-ppc64le": 5, "updates-server-2arch": 5
"fedora-updates-server-x86_64-*-64bit": 5
} }
}, },
"server_firewall_default": { "server_firewall_default": {
"profiles": { "profile_groups": {
"fedora-updates-server-aarch64-*-aarch64": 5, "updates-server-3arch": 5
"fedora-updates-server-ppc64le-*-ppc64le": 5,
"fedora-updates-server-x86_64-*-64bit": 5
} }
}, },
"server_freeipa_replication_client": { "server_freeipa_replication_client": {
@ -543,33 +521,28 @@
} }
}, },
"server_remote_logging_client": { "server_remote_logging_client": {
"profiles": { "profile_groups": {
"fedora-updates-server-ppc64le-*-ppc64le": 5, "updates-server-2arch": 5
"fedora-updates-server-x86_64-*-64bit": 5
} }
}, },
"server_remote_logging_server": { "server_remote_logging_server": {
"profiles": { "profile_groups": {
"fedora-updates-server-ppc64le-*-ppc64le": 5, "updates-server-2arch": 5
"fedora-updates-server-x86_64-*-64bit": 5
} }
}, },
"server_role_deploy_database_server": { "server_role_deploy_database_server": {
"profiles": { "profile_groups": {
"fedora-updates-server-ppc64le-*-ppc64le": 5, "updates-server-2arch": 5
"fedora-updates-server-x86_64-*-64bit": 5
} }
}, },
"server_role_deploy_domain_controller": { "server_role_deploy_domain_controller": {
"profiles": { "profile_groups": {
"fedora-updates-server-ppc64le-*-ppc64le": 5, "updates-server-2arch": 5
"fedora-updates-server-x86_64-*-64bit": 5
} }
}, },
"server_samba_domain_controller": { "server_samba_domain_controller": {
"profiles": { "profile_groups": {
"fedora-updates-server-ppc64le-*-ppc64le": 5, "updates-server-2arch": 5
"fedora-updates-server-x86_64-*-64bit": 5
} }
}, },
"support_server": { "support_server": {

1123
templates.fif.json
View File

File diff suppressed because it is too large Load Diff