From ff73327eecf7c40178f74c661233ebf24711a0d7 Mon Sep 17 00:00:00 2001 From: Florent 'Skia' Jacquet Date: Tue, 4 Mar 2025 09:37:55 +0100 Subject: [PATCH 1/2] Revert "Add more logging around riscv64 filtering" This reverts commit 75d0ee30a16c6ccb23b409e115444b82cb933c5d. This reverts commit 2317404ee1bba836c4cbbe284f8cf27c34c924aa. This reverts commit 9b1167f52d3c9f7fe2868d11fa1b509e75a275c3. This reverts commit f8c4cc3ecc19509c05345bf0f34ce76462aa1186. --- britney2/policies/autopkgtest.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/britney2/policies/autopkgtest.py b/britney2/policies/autopkgtest.py index 9e51f3d..170ab91 100644 --- a/britney2/policies/autopkgtest.py +++ b/britney2/policies/autopkgtest.py @@ -845,18 +845,12 @@ class AutopkgtestPolicy(BasePolicy): # The goal is to stress test the autopkgtest infrastructure by having # britney throw some tests at it, but we don't want the whole universe to come # there either, hence the filtering on main. - self.logger.info(f"[riscv64] Checking if we should run a riscv64 test, arch is {arch}") try: # Filter tests to main packages on riscv64 if arch == "riscv64": - self.logger.info("[riscv64] Arch detected as riscv64") - self.logger.info("[riscv64] pre-filtering tests: %s", tests) - tests = [(src, version) for (src, version) in tests if ((self.logger.info("[riscv64] sources info: %s - component: %s", sources_info[src], sources_info[src].component) or True) and sources_info[src].component == "main")] - self.logger.info("[riscv64] post-filtering tests: %s", tests) + tests = [(src, version) for (src, version) in tests if sources_info[src].component == "main"] except KeyError: # Sometimes™, sources_info[src] raises KeyError - self.logger.info("[riscv64] KeyError while checking component") pass - self.logger.info("[riscv64] done checking for riscv64") tests.sort(key=lambda s_v: s_v[0]) return tests From e53225e6e2575b07dd0651a94b990b6a4763502f Mon Sep 17 00:00:00 2001 From: Florent 'Skia' Jacquet Date: Tue, 4 Mar 2025 09:41:27 +0100 Subject: [PATCH 2/2] Fix riscv64 tests filtering on main --- britney2/policies/autopkgtest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/britney2/policies/autopkgtest.py b/britney2/policies/autopkgtest.py index 170ab91..5477fff 100644 --- a/britney2/policies/autopkgtest.py +++ b/britney2/policies/autopkgtest.py @@ -43,7 +43,7 @@ import britney2.hints from britney2 import SuiteClass from britney2.policies.policy import BasePolicy, PolicyVerdict -from britney2.utils import iter_except +from britney2.utils import iter_except, UbuntuComponent class Result(Enum): @@ -848,7 +848,7 @@ class AutopkgtestPolicy(BasePolicy): try: # Filter tests to main packages on riscv64 if arch == "riscv64": - tests = [(src, version) for (src, version) in tests if sources_info[src].component == "main"] + tests = [(src, version) for (src, version) in tests if sources_info[src].component == UbuntuComponent.MAIN] except KeyError: # Sometimes™, sources_info[src] raises KeyError pass