From 1429e5b1c848cd0e0bcfb5136c2bcb737a0a0909 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 28 Nov 2022 08:43:30 -0800 Subject: [PATCH] Give all update tests the same priority, ahead of compose tests It doesn't make sense for update tests to have different priorities. We gate on all update tests, so they are all equally important. With varying priorities we get a problem: if 10 updates are created quite close together, first we do all the prio 30 and prio 40 tests for all of them, and only after all of those are done do we get to the prio 41 and 42 tests for the earliest of the updates, which means they can be waiting longer than they should to have all the tests done. If all the tests have the same priority, openQA should always use creation time to order them, so it should prioritize finishing tests for earlier updates, which is what we want. Update tests are also more time-critical than compose tests, because we gate on update tests. So we should prioritize update tests over compose tests in all cases. Signed-off-by: Adam Williamson --- templates-updates.fif.json | 200 ++++++++++++++++++------------------- 1 file changed, 100 insertions(+), 100 deletions(-) diff --git a/templates-updates.fif.json b/templates-updates.fif.json index 909f8fd3..31a9cce7 100644 --- a/templates-updates.fif.json +++ b/templates-updates.fif.json @@ -243,9 +243,9 @@ "TestSuites": { "advisory_boot": { "profiles": { - "fedora-updates-server-aarch64-*-aarch64": 40, - "fedora-updates-server-ppc64le-*-ppc64le": 40, - "fedora-updates-server-x86_64-*-64bit": 40 + "fedora-updates-server-aarch64-*-aarch64": 5, + "fedora-updates-server-ppc64le-*-ppc64le": 5, + "fedora-updates-server-x86_64-*-64bit": 5 }, "settings": { "ADVISORY_BOOT_TEST": "1", @@ -256,94 +256,94 @@ }, "base_selinux": { "profiles": { - "fedora-updates-kde-x86_64-*-64bit": 42, - "fedora-updates-server-aarch64-*-aarch64": 40, - "fedora-updates-server-ppc64le-*-ppc64le": 40, - "fedora-updates-server-x86_64-*-64bit": 40, - "fedora-updates-workstation-x86_64-*-64bit": 40 + "fedora-updates-kde-x86_64-*-64bit": 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": { "profiles": { - "fedora-updates-kde-x86_64-*-64bit": 42, - "fedora-updates-server-aarch64-*-aarch64": 40, - "fedora-updates-server-ppc64le-*-ppc64le": 40, - "fedora-updates-server-x86_64-*-64bit": 40, - "fedora-updates-workstation-x86_64-*-64bit": 40 + "fedora-updates-kde-x86_64-*-64bit": 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": { "profiles": { - "fedora-updates-kde-x86_64-*-64bit": 42, - "fedora-updates-server-aarch64-*-aarch64": 40, - "fedora-updates-server-ppc64le-*-ppc64le": 40, - "fedora-updates-server-x86_64-*-64bit": 40, - "fedora-updates-workstation-x86_64-*-64bit": 40 + "fedora-updates-kde-x86_64-*-64bit": 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": { "profiles": { - "fedora-updates-kde-x86_64-*-64bit": 42, - "fedora-updates-server-aarch64-*-aarch64": 40, - "fedora-updates-server-ppc64le-*-ppc64le": 40, - "fedora-updates-server-x86_64-*-64bit": 40, - "fedora-updates-workstation-x86_64-*-64bit": 40 + "fedora-updates-kde-x86_64-*-64bit": 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": { "profiles": { - "fedora-updates-kde-x86_64-*-64bit": 42, - "fedora-updates-server-aarch64-*-aarch64": 40, - "fedora-updates-server-ppc64le-*-ppc64le": 40, - "fedora-updates-server-x86_64-*-64bit": 40, - "fedora-updates-workstation-x86_64-*-64bit": 40 + "fedora-updates-kde-x86_64-*-64bit": 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": { "profiles": { - "fedora-updates-kde-x86_64-*-64bit": 42, - "fedora-updates-server-aarch64-*-aarch64": 40, - "fedora-updates-server-ppc64le-*-ppc64le": 40, - "fedora-updates-server-x86_64-*-64bit": 40, - "fedora-updates-workstation-x86_64-*-64bit": 40 + "fedora-updates-kde-x86_64-*-64bit": 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": { "profiles": { - "fedora-updates-kde-x86_64-*-64bit": 32, - "fedora-updates-workstation-x86_64-*-64bit": 30 + "fedora-updates-kde-x86_64-*-64bit": 5, + "fedora-updates-workstation-x86_64-*-64bit": 5 } }, "desktop_browser": { "profiles": { - "fedora-updates-kde-x86_64-*-64bit": 32, - "fedora-updates-workstation-x86_64-*-64bit": 30 + "fedora-updates-kde-x86_64-*-64bit": 5, + "fedora-updates-workstation-x86_64-*-64bit": 5 } }, "desktop_printing": { "profiles": { - "fedora-updates-kde-x86_64-*-64bit": 32, - "fedora-updates-workstation-x86_64-*-64bit": 30 + "fedora-updates-kde-x86_64-*-64bit": 5, + "fedora-updates-workstation-x86_64-*-64bit": 5 } }, "desktop_terminal": { "profiles": { - "fedora-updates-kde-x86_64-*-64bit": 32, - "fedora-updates-workstation-x86_64-*-64bit": 30 + "fedora-updates-kde-x86_64-*-64bit": 5, + "fedora-updates-workstation-x86_64-*-64bit": 5 } }, "desktop_update_graphical": { "profiles": { - "fedora-updates-kde-x86_64-*-64bit": 32, - "fedora-updates-workstation-x86_64-*-64bit": 30 + "fedora-updates-kde-x86_64-*-64bit": 5, + "fedora-updates-workstation-x86_64-*-64bit": 5 } }, "install_default_update_live": { "profiles": { - "fedora-updates-kde-live-iso-x86_64-*-64bit": 40, - "fedora-updates-kde-live-iso-x86_64-*-uefi": 41, - "fedora-updates-workstation-live-iso-x86_64-*-64bit": 40, - "fedora-updates-workstation-live-iso-x86_64-*-uefi": 41 + "fedora-updates-kde-live-iso-x86_64-*-64bit": 5, + "fedora-updates-kde-live-iso-x86_64-*-uefi": 5, + "fedora-updates-workstation-live-iso-x86_64-*-64bit": 5, + "fedora-updates-workstation-live-iso-x86_64-*-uefi": 5 }, "settings": { "+START_AFTER_TEST": "live_build@%ARCH_BASE_MACHINE%", @@ -354,8 +354,8 @@ }, "install_default_update_netinst": { "profiles": { - "fedora-updates-everything-boot-iso-x86_64-*-64bit": 40, - "fedora-updates-everything-boot-iso-x86_64-*-uefi": 41 + "fedora-updates-everything-boot-iso-x86_64-*-64bit": 5, + "fedora-updates-everything-boot-iso-x86_64-*-uefi": 5 }, "settings": { "+START_AFTER_TEST": "installer_build@%ARCH_BASE_MACHINE%", @@ -371,7 +371,7 @@ }, "installer_build": { "profiles": { - "fedora-updates-everything-boot-iso-x86_64-*-64bit": 40 + "fedora-updates-everything-boot-iso-x86_64-*-64bit": 5 }, "settings": { "BOOTFROM": "c", @@ -384,8 +384,8 @@ }, "live_build": { "profiles": { - "fedora-updates-kde-live-iso-x86_64-*-64bit": 40, - "fedora-updates-workstation-live-iso-x86_64-*-64bit": 40 + "fedora-updates-kde-live-iso-x86_64-*-64bit": 5, + "fedora-updates-workstation-live-iso-x86_64-*-64bit": 5 }, "settings": { "+DESKTOP": "", @@ -403,130 +403,130 @@ }, "podman": { "profiles": { - "fedora-updates-container-aarch64-*-aarch64": 40, - "fedora-updates-container-ppc64le-*-ppc64le": 40, - "fedora-updates-container-x86_64-*-64bit": 40 + "fedora-updates-container-aarch64-*-aarch64": 5, + "fedora-updates-container-ppc64le-*-ppc64le": 5, + "fedora-updates-container-x86_64-*-64bit": 5 } }, "podman_client": { "profiles": { - "fedora-updates-container-aarch64-*-aarch64": 40, - "fedora-updates-container-ppc64le-*-ppc64le": 40, - "fedora-updates-container-x86_64-*-64bit": 40 + "fedora-updates-container-aarch64-*-aarch64": 5, + "fedora-updates-container-ppc64le-*-ppc64le": 5, + "fedora-updates-container-x86_64-*-64bit": 5 } }, "realmd_join_cockpit": { "profiles": { - "fedora-updates-server-aarch64-*-aarch64": 40, - "fedora-updates-server-ppc64le-*-ppc64le": 40, - "fedora-updates-server-x86_64-*-64bit": 40 + "fedora-updates-server-aarch64-*-aarch64": 5, + "fedora-updates-server-ppc64le-*-ppc64le": 5, + "fedora-updates-server-x86_64-*-64bit": 5 } }, "realmd_join_sssd": { "profiles": { - "fedora-updates-server-aarch64-*-aarch64": 30, - "fedora-updates-server-ppc64le-*-ppc64le": 30, - "fedora-updates-server-x86_64-*-64bit": 30 + "fedora-updates-server-aarch64-*-aarch64": 5, + "fedora-updates-server-ppc64le-*-ppc64le": 5, + "fedora-updates-server-x86_64-*-64bit": 5 } }, "server_cockpit_basic": { "profiles": { - "fedora-updates-server-aarch64-*-aarch64": 40, - "fedora-updates-server-ppc64le-*-ppc64le": 40, - "fedora-updates-server-x86_64-*-64bit": 40 + "fedora-updates-server-aarch64-*-aarch64": 5, + "fedora-updates-server-ppc64le-*-ppc64le": 5, + "fedora-updates-server-x86_64-*-64bit": 5 } }, "server_cockpit_default": { "profiles": { - "fedora-updates-server-aarch64-*-aarch64": 40, - "fedora-updates-server-ppc64le-*-ppc64le": 40, - "fedora-updates-server-x86_64-*-64bit": 40 + "fedora-updates-server-aarch64-*-aarch64": 5, + "fedora-updates-server-ppc64le-*-ppc64le": 5, + "fedora-updates-server-x86_64-*-64bit": 5 } }, "server_cockpit_updates": { "profiles": { - "fedora-updates-server-aarch64-*-aarch64": 40, - "fedora-updates-server-ppc64le-*-ppc64le": 40, - "fedora-updates-server-x86_64-*-64bit": 40 + "fedora-updates-server-aarch64-*-aarch64": 5, + "fedora-updates-server-ppc64le-*-ppc64le": 5, + "fedora-updates-server-x86_64-*-64bit": 5 } }, "server_database_client": { "profiles": { - "fedora-updates-server-aarch64-*-aarch64": 40, - "fedora-updates-server-ppc64le-*-ppc64le": 40, - "fedora-updates-server-x86_64-*-64bit": 40 + "fedora-updates-server-aarch64-*-aarch64": 5, + "fedora-updates-server-ppc64le-*-ppc64le": 5, + "fedora-updates-server-x86_64-*-64bit": 5 } }, "server_firewall_default": { "profiles": { - "fedora-updates-server-aarch64-*-aarch64": 40, - "fedora-updates-server-ppc64le-*-ppc64le": 40, - "fedora-updates-server-x86_64-*-64bit": 40 + "fedora-updates-server-aarch64-*-aarch64": 5, + "fedora-updates-server-ppc64le-*-ppc64le": 5, + "fedora-updates-server-x86_64-*-64bit": 5 } }, "server_freeipa_replication_client": { "profiles": { - "fedora-updates-server-x86_64-*-64bit": 40 + "fedora-updates-server-x86_64-*-64bit": 5 } }, "server_freeipa_replication_master": { "profiles": { - "fedora-updates-server-x86_64-*-64bit": 40 + "fedora-updates-server-x86_64-*-64bit": 5 } }, "server_freeipa_replication_replica": { "profiles": { - "fedora-updates-server-x86_64-*-64bit": 40 + "fedora-updates-server-x86_64-*-64bit": 5 } }, "server_remote_logging_client": { "profiles": { - "fedora-updates-server-aarch64-*-aarch64": 40, - "fedora-updates-server-ppc64le-*-ppc64le": 40, - "fedora-updates-server-x86_64-*-64bit": 40 + "fedora-updates-server-aarch64-*-aarch64": 5, + "fedora-updates-server-ppc64le-*-ppc64le": 5, + "fedora-updates-server-x86_64-*-64bit": 5 } }, "server_remote_logging_server": { "profiles": { - "fedora-updates-server-aarch64-*-aarch64": 40, - "fedora-updates-server-ppc64le-*-ppc64le": 40, - "fedora-updates-server-x86_64-*-64bit": 40 + "fedora-updates-server-aarch64-*-aarch64": 5, + "fedora-updates-server-ppc64le-*-ppc64le": 5, + "fedora-updates-server-x86_64-*-64bit": 5 } }, "server_role_deploy_database_server": { "profiles": { - "fedora-updates-server-aarch64-*-aarch64": 40, - "fedora-updates-server-ppc64le-*-ppc64le": 40, - "fedora-updates-server-x86_64-*-64bit": 40 + "fedora-updates-server-aarch64-*-aarch64": 5, + "fedora-updates-server-ppc64le-*-ppc64le": 5, + "fedora-updates-server-x86_64-*-64bit": 5 } }, "server_role_deploy_domain_controller": { "profiles": { - "fedora-updates-server-aarch64-*-aarch64": 40, - "fedora-updates-server-ppc64le-*-ppc64le": 40, - "fedora-updates-server-x86_64-*-64bit": 40 + "fedora-updates-server-aarch64-*-aarch64": 5, + "fedora-updates-server-ppc64le-*-ppc64le": 5, + "fedora-updates-server-x86_64-*-64bit": 5 } }, "support_server": { "profiles": { - "fedora-updates-everything-boot-iso-x86_64-*-64bit": 40 + "fedora-updates-everything-boot-iso-x86_64-*-64bit": 5 } }, "upgrade_desktop_encrypted_64bit": { "profiles": { - "fedora-updates-workstation-upgrade-x86_64-*-64bit": 40 + "fedora-updates-workstation-upgrade-x86_64-*-64bit": 5 } }, "upgrade_realmd_client": { "profiles": { - "fedora-updates-server-upgrade-ppc64le-*-ppc64le": 30, - "fedora-updates-server-upgrade-x86_64-*-64bit": 30 + "fedora-updates-server-upgrade-ppc64le-*-ppc64le": 5, + "fedora-updates-server-upgrade-x86_64-*-64bit": 5 } }, "upgrade_server_domain_controller": { "profiles": { - "fedora-updates-server-upgrade-ppc64le-*-ppc64le": 40, - "fedora-updates-server-upgrade-x86_64-*-64bit": 40 + "fedora-updates-server-upgrade-ppc64le-*-ppc64le": 5, + "fedora-updates-server-upgrade-x86_64-*-64bit": 5 } } }