From 1d45b2a3b2cd2f34c817aa759812d1e427dc81ea Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Tue, 7 Aug 2018 19:28:25 +0000 Subject: [PATCH] Move autopkgtest specific field to Autopkgtest policy Signed-off-by: Niels Thykier --- britney.py | 8 -------- britney2/policies/autopkgtest.py | 10 +++++++++- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/britney.py b/britney.py index d957556..a140b9b 100755 --- a/britney.py +++ b/britney.py @@ -325,14 +325,6 @@ class Britney(object): suite.sources = sources suite.binaries = self.read_binaries(suite, self.options.architectures) - # compute inverse Testsuite-Triggers: map, unifying all series - self.logger.info('Building inverse testsuite_triggers map') - self.testsuite_triggers = {} - for suite in self.suite_info: - for src, data in suite.sources.items(): - for trigger in data.testsuite_triggers: - self.testsuite_triggers.setdefault(trigger, set()).add(src) - try: constraints_file = os.path.join(self.options.static_input_dir, 'constraints') faux_packages = os.path.join(self.options.static_input_dir, 'faux-packages') diff --git a/britney2/policies/autopkgtest.py b/britney2/policies/autopkgtest.py index 5a30f1d..a02b904 100644 --- a/britney2/policies/autopkgtest.py +++ b/britney2/policies/autopkgtest.py @@ -77,6 +77,7 @@ class AutopkgtestPolicy(BasePolicy): # trigger -> src -> [arch] self.pending_tests = None self.pending_tests_file = os.path.join(self.state_dir, 'autopkgtest-pending.json') + self.testsuite_triggers = {} # results map: trigger -> src -> arch -> [passed, version, run_id] # - trigger is "source/version" of an unstable package that triggered @@ -116,6 +117,13 @@ class AutopkgtestPolicy(BasePolicy): def initialise(self, britney): super().initialise(britney) + # compute inverse Testsuite-Triggers: map, unifying all series + self.logger.info('Building inverse testsuite_triggers map') + for suite in self.suite_info: + for src, data in suite.sources.items(): + for trigger in data.testsuite_triggers: + self.testsuite_triggers.setdefault(trigger, set()).add(src) + os.makedirs(self.state_dir, exist_ok=True) self.read_pending_tests() @@ -468,7 +476,7 @@ class AutopkgtestPolicy(BasePolicy): tests.append((rdep_src, rdep_src_info.version)) reported_pkgs.add(rdep_src) - for tdep_src in self.britney.testsuite_triggers.get(binary.package_name, set()): + for tdep_src in self.testsuite_triggers.get(binary.package_name, set()): if tdep_src not in reported_pkgs: try: tdep_src_info = sources_info[tdep_src]