Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-04-14 20:51:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move autopkgtest specific field to Autopkgtest policy

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2018-08-07 19:28:25 +00:00
parent 8d2cabd914
commit 1d45b2a3b2
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
britney.py
View File

@ -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')

10
britney2/policies/autopkgtest.py
View File

@ -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]