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

autopkgtest: Trigger dkms when there's a dep on dkms

Browse Source 
Most DKMS packages do not declare Testsuite: autopkgtest-pkg-dkms, but
we can detect this anyway, and this way we can enforce that the module
is buildable.
This commit is contained in:
Iain Lane 2020-06-02 11:09:39 +01:00 committed by Iain Lane
parent d960c15706
commit af091a504c
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
britney2/policies/autopkgtest.py
View File

@ -491,7 +491,7 @@ class AutopkgtestPolicy(BasePolicy):
# #
@classmethod @classmethod
def has_autodep8(kls, srcinfo): def has_autodep8(kls, srcinfo, binaries):
'''Check if package is covered by autodep8 '''Check if package is covered by autodep8
srcinfo is an item from self.britney.sources srcinfo is an item from self.britney.sources
@ -502,6 +502,14 @@ class AutopkgtestPolicy(BasePolicy):
if t.startswith('autopkgtest-pkg'): if t.startswith('autopkgtest-pkg'):
return True return True
# DKMS: some binary depends on "dkms"
for pkg_id in srcinfo.binaries:
try:
bininfo = binaries[pkg_id.package_name]
except KeyError:
continue
if 'dkms' in (bininfo.depends or ''):
return True
return False return False
def request_tests_for_source(self, item, arch, source_data_srcdist, pkg_arch_result, excuse): def request_tests_for_source(self, item, arch, source_data_srcdist, pkg_arch_result, excuse):
@ -646,7 +654,7 @@ class AutopkgtestPolicy(BasePolicy):
# we want to test the package itself, if it still has a test in unstable # we want to test the package itself, if it still has a test in unstable
# but only if the package actually exists on this arch # but only if the package actually exists on this arch
srcinfo = source_suite.sources[src] srcinfo = source_suite.sources[src]
if ('autopkgtest' in srcinfo.testsuite or self.has_autodep8(srcinfo)) and \ if ('autopkgtest' in srcinfo.testsuite or self.has_autodep8(srcinfo, binaries_info)) and \
len(excuse.packages[arch]) > 0: len(excuse.packages[arch]) > 0:
reported_pkgs.add(src) reported_pkgs.add(src)
tests.append((src, ver)) tests.append((src, ver))
@ -682,7 +690,7 @@ class AutopkgtestPolicy(BasePolicy):
continue continue
rdep_src_info = sources_info[rdep_src] rdep_src_info = sources_info[rdep_src]
if 'autopkgtest' in rdep_src_info.testsuite or self.has_autodep8(rdep_src_info): if 'autopkgtest' in rdep_src_info.testsuite or self.has_autodep8(rdep_src_info, binaries_info):
if rdep_src not in reported_pkgs: if rdep_src not in reported_pkgs:
tests.append((rdep_src, rdep_src_info.version)) tests.append((rdep_src, rdep_src_info.version))
reported_pkgs.add(rdep_src) reported_pkgs.add(rdep_src)
@ -693,7 +701,7 @@ class AutopkgtestPolicy(BasePolicy):
tdep_src_info = sources_info[tdep_src] tdep_src_info = sources_info[tdep_src]
except KeyError: except KeyError:
continue continue
if 'autopkgtest' in tdep_src_info.testsuite or self.has_autodep8(tdep_src_info): if 'autopkgtest' in tdep_src_info.testsuite or self.has_autodep8(tdep_src_info, binaries_info):
for pkg_id in tdep_src_info.binaries: for pkg_id in tdep_src_info.binaries:
if pkg_id.architecture == arch: if pkg_id.architecture == arch:
tests.append((tdep_src, tdep_src_info.version)) tests.append((tdep_src, tdep_src_info.version))
@ -1066,9 +1074,13 @@ class AutopkgtestPolicy(BasePolicy):
Return (status, real_version, run_id, log_url) tuple; status is a key in Return (status, real_version, run_id, log_url) tuple; status is a key in
EXCUSES_LABELS. run_id is None if the test is still running. EXCUSES_LABELS. run_id is None if the test is still running.
''' '''
target_suite = self.suite_info.target_suite
binaries_info = target_suite.binaries[arch]
# determine current test result status # determine current test result status
baseline_result = self.result_in_baseline(src, arch)[0] baseline_result = self.result_in_baseline(src, arch)[0]
url = None url = None
run_id = None run_id = None
try: try:
@ -1093,7 +1105,7 @@ class AutopkgtestPolicy(BasePolicy):
test_in_target = False test_in_target = False
try: try:
srcinfo = self.suite_info.target_suite.sources[src] srcinfo = self.suite_info.target_suite.sources[src]
if 'autopkgtest' in srcinfo.testsuite or self.has_autodep8(srcinfo): if 'autopkgtest' in srcinfo.testsuite or self.has_autodep8(srcinfo, binaries_info):
test_in_target = True test_in_target = True
except KeyError: except KeyError:
pass pass

2
tests/test_autopkgtest.py
View File

@ -1980,7 +1980,7 @@ class AT(TestAutopkgtestBase):
'''DKMS results get mapped to the triggering kernel version''' '''DKMS results get mapped to the triggering kernel version'''
self.data.add('dkms', False, {}) self.data.add('dkms', False, {})
self.data.add('fancy-dkms', False, {'Source': 'fancy', 'Depends': 'dkms (>= 1)'}, testsuite='autopkgtest-pkg-dkms') self.data.add('fancy-dkms', False, {'Source': 'fancy', 'Depends': 'dkms (>= 1)'})
# works against linux-meta and -64only, fails against grumpy i386, no # works against linux-meta and -64only, fails against grumpy i386, no
# result yet for grumpy amd64 # result yet for grumpy amd64