Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-17 21:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Addressing cjwatson points, mainly moving 'excuse' handling logic back to britney.

Browse Source
This commit is contained in:
Celso Providelo 2015-01-22 14:43:37 -02:00
parent cc9097e2ed
commit 1bfe4c69eb
2 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
boottest.py
View File

@ -74,8 +74,11 @@ class BootTest(object):
self.debug = debug self.debug = debug
self.phone_manifest = TouchManifest(self.distribution, self.series) self.phone_manifest = TouchManifest(self.distribution, self.series)
def _get_status_label(self, name, version): def _get_status(self, name, version):
"""Return the current boottest status label.""" """Return the current boottest status.
Request a boottest attempt if it's new.
"""
# XXX cprov 20150120: replace with the test history latest # XXX cprov 20150120: replace with the test history latest
# record label, or a new job request if it was not found. # record label, or a new job request if it was not found.
if name == 'pyqt5': if name == 'pyqt5':
@ -86,43 +89,28 @@ class BootTest(object):
return 'IN PROGRESS' return 'IN PROGRESS'
def update(self, excuse): def update(self, excuse):
"""Update given 'excuse'. """Update given 'excuse' and yields testing status.
Return True if it has already failed or still in progress (so Yields (status, binary_name) for each binary considered for the
promotion should be blocked), otherwise (test skipped or passed) given excuse. See `_get_status()`.
False.
Annotate skipped packages (currently not in phone image) or add Binaries are considered for boottesting if they are part of the
the current testing status (see `_get_status_label`). phone image manifest. See `TouchManifest`.
""" """
# Discover all binaries for the 'excused' source. # Discover all binaries for the 'excused' source.
unstable_sources = self.britney.sources['unstable'] unstable_sources = self.britney.sources['unstable']
# XXX cprov 20150120: binaries are a seq of "<binname>/<arch>" and,
# practically, boottest is only concerned about armhf+all binaries.
# Anything else should be skipped.
binary_names = [ binary_names = [
bin.split('/')[0] bin.split('/')[0]
for bin in unstable_sources[excuse.name][BINARIES] for bin in unstable_sources[excuse.name][BINARIES]
] ]
# Process (request or update) boottest attempts for each binary. # Process (request or update) boottest attempts for each binary.
labels = set()
for name in binary_names: for name in binary_names:
if name in self.phone_manifest: if name in self.phone_manifest:
label = self._get_status_label(name, excuse.ver[1]) status = self._get_status(name, excuse.ver[1])
else: else:
label = 'SKIPPED' status = 'SKIPPED'
excuse.addhtml("boottest for %s %s: %s" % yield name, status
(name, excuse.ver[1], label))
labels.add(label)
# If all boottests passed or were skipped, return False. The
# excuse is clean and promotion can proceed, according to the
# boottest criteria.
if labels.issubset(set(['PASS', 'SKIPPED'])):
return False
# If one or more boottests are still in-progress or have already
# failed, make the excuse as invalid and blocks promotion by
# returning True.
excuse.addhtml("Not considered")
excuse.addreason("boottest")
excuse.is_valid = False
return True

13
britney.py
View File

@ -1897,9 +1897,20 @@ class Britney(object):
# Skip already invalid excuses. # Skip already invalid excuses.
if not excuse.is_valid: if not excuse.is_valid:
continue continue
labels = set()
# Update valid excuses from the boottest context and if they # Update valid excuses from the boottest context and if they
# have failed, block their migration. # have failed, block their migration.
if boottest.update(excuse): for binary_name, label in boottest.update(excuse):
excuse.addhtml("boottest for %s %s: %s" %
(binary_name, excuse.ver[1], label))
labels.add(label)
# If all boottests passed or were skipped, the excuse is
# clean and promotion can proceed, according to the
# boottest criteria. Otherwise block the promotion.
if not labels.issubset(set(['PASS', 'SKIPPED'])):
excuse.addhtml("Not considered")
excuse.addreason("boottest")
excuse.is_valid = False
upgrade_me.remove(excuse.name) upgrade_me.remove(excuse.name)
unconsidered.append(excuse.name) unconsidered.append(excuse.name)