From 3a35ad54c74c1a458ee0a5649f2fbbe0ed8abbac Mon Sep 17 00:00:00 2001 From: Katerina Koukiou Date: Wed, 26 Feb 2025 15:30:12 +0100 Subject: [PATCH 1/2] lib: testmap: add two new anaconda test scenarios --- lib/testmap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/testmap.py b/lib/testmap.py index 3b3066209..c9ad8f511 100644 --- a/lib/testmap.py +++ b/lib/testmap.py @@ -22,7 +22,7 @@ from lib.constants import TEST_OS_DEFAULT COCKPIT_SCENARIOS = {'networking', 'storage', 'expensive', 'other'} -ANACONDA_SCENARIOS = {'expensive', 'other'} +ANACONDA_SCENARIOS = {'cockpit', 'storage', 'expensive', 'other'} def contexts(image: str, *scenarios: Iterable[str], repo: str | None = None) -> Sequence[str]: From 8768cbb5b36f7efc4a10bc07a2a66ea9f472c4f3 Mon Sep 17 00:00:00 2001 From: Katerina Koukiou Date: Wed, 26 Feb 2025 16:21:19 +0100 Subject: [PATCH 2/2] lib: testmap: make 'efi' a scenario not a context We have ~7 EFI tests currently. Keeping EFI as context would spawn the following: fedora-[rawhide,42]-boot/efi-[cockpit,storage,other,expensive] creating a massive overhead for 7 tests. Let's run all EFI tests in one scenaerio: fedora-[rawhide,42]-boot/efi. --- lib/testmap.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/testmap.py b/lib/testmap.py index c9ad8f511..b165c5e9e 100644 --- a/lib/testmap.py +++ b/lib/testmap.py @@ -22,7 +22,7 @@ from lib.constants import TEST_OS_DEFAULT COCKPIT_SCENARIOS = {'networking', 'storage', 'expensive', 'other'} -ANACONDA_SCENARIOS = {'cockpit', 'storage', 'expensive', 'other'} +ANACONDA_SCENARIOS = {'efi', 'cockpit', 'storage', 'expensive', 'other'} def contexts(image: str, *scenarios: Iterable[str], repo: str | None = None) -> Sequence[str]: @@ -224,9 +224,9 @@ def contexts(image: str, *scenarios: Iterable[str], repo: str | None = None) -> 'rhinstaller/anaconda-webui': { 'main': [ *contexts('fedora-42-boot', ANACONDA_SCENARIOS), - *contexts('fedora-42-boot', ['efi'], ANACONDA_SCENARIOS), + *contexts('fedora-42-boot', ANACONDA_SCENARIOS), + *contexts('fedora-rawhide-boot', ANACONDA_SCENARIOS), *contexts('fedora-rawhide-boot', ANACONDA_SCENARIOS), - *contexts('fedora-rawhide-boot', ['efi'], ANACONDA_SCENARIOS), ], '_manual': [ 'fedora-eln-boot',