Lubuntu
/
britney2-ubuntu
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Track architectures in requested/pending tests

Browse Source 
This is necessary so that we can properly match requested to received results
when the latter arrive in different runs for different architectures.

This also opens up the possibility of per-arch blacklisting later.
bzr-import-20160707
Martin Pitt 10 years ago
parent bf470c6da0
commit 6e167a0343
2 changed files with 53 additions and 33 deletions
Show Stats Download Patch File Download Diff File

65
autopkgtest.py
Unescape View File

@ -61,7 +61,7 @@ class AutoPackageTest(object):
self.test_state_dir = os.path.join(britney.options.unstable, self.test_state_dir = os.path.join(britney.options.unstable,
'autopkgtest') 'autopkgtest')
# map of requested tests from request() # map of requested tests from request()
# src -> ver -> {(triggering-src1, ver1), ...} # src -> ver -> arch -> {(triggering-src1, ver1), ...}
self.requested_tests = {} self.requested_tests = {}
# same map for tests requested in previous runs # same map for tests requested in previous runs
self.pending_tests = None self.pending_tests = None
@ -136,13 +136,13 @@ class AutoPackageTest(object):
if not l: if not l:
continue continue
try: try:
(src, ver, trigsrc, trigver) = l.split() (src, ver, arch, trigsrc, trigver) = l.split()
except ValueError: except ValueError:
self.log_error('ignoring malformed line in %s: %s' % self.log_error('ignoring malformed line in %s: %s' %
(self.pending_tests_file, l)) (self.pending_tests_file, l))
continue continue
self.pending_tests.setdefault(src, {}).setdefault( self.pending_tests.setdefault(src, {}).setdefault(
ver, set()).add((trigsrc, trigver)) ver, {}).setdefault(arch, set()).add((trigsrc, trigver))
self.log_verbose('Read pending requested tests from %s: %s' % self.log_verbose('Read pending requested tests from %s: %s' %
(self.pending_tests_file, self.pending_tests)) (self.pending_tests_file, self.pending_tests))
@ -154,33 +154,36 @@ class AutoPackageTest(object):
''' '''
# merge requested_tests into pending_tests # merge requested_tests into pending_tests
for src, verinfo in self.requested_tests.items(): for src, verinfo in self.requested_tests.items():
for ver, triggers in verinfo.items(): for ver, archinfo in verinfo.items():
self.pending_tests.setdefault(src, {}).setdefault( for arch, triggers in archinfo.items():
ver, set()).update(triggers) self.pending_tests.setdefault(src, {}).setdefault(
ver, {}).setdefault(arch, set()).update(triggers)
self.requested_tests = {} self.requested_tests = {}
# write it # write it
with open(self.pending_tests_file + '.new', 'w') as f: with open(self.pending_tests_file + '.new', 'w') as f:
for src in sorted(self.pending_tests): for src in sorted(self.pending_tests):
for ver in sorted(self.pending_tests[src]): for ver in sorted(self.pending_tests[src]):
for (trigsrc, trigver) in sorted(self.pending_tests[src][ver]): for arch in sorted(self.pending_tests[src][ver]):
f.write('%s %s %s %s\n' % (src, ver, trigsrc, trigver)) for (trigsrc, trigver) in sorted(self.pending_tests[src][ver][arch]):
f.write('%s %s %s %s %s\n' % (src, ver, arch, trigsrc, trigver))
os.rename(self.pending_tests_file + '.new', self.pending_tests_file) os.rename(self.pending_tests_file + '.new', self.pending_tests_file)
self.log_verbose('Updated pending requested tests in %s' % self.log_verbose('Updated pending requested tests in %s' %
self.pending_tests_file) self.pending_tests_file)
def add_test_request(self, src, ver, trigsrc, trigver): def add_test_request(self, src, ver, arch, trigsrc, trigver):
'''Add one test request to the local self.requested_tests queue '''Add one test request to the local self.requested_tests queue
This will only be done if that test wasn't already requested in a This will only be done if that test wasn't already requested in a
previous run, i. e. it is already in self.pending_tests. previous run, i. e. it is already in self.pending_tests.
''' '''
if (trigsrc, trigver) in self.pending_tests.get(src, {}).get(ver, set()): if (trigsrc, trigver) in self.pending_tests.get(src, {}).get(
self.log_verbose('test %s/%s for %s/%s is already pending, not queueing' % ver, {}).get(arch, set()):
(src, ver, trigsrc, trigver)) self.log_verbose('test %s/%s/%s for %s/%s is already pending, not queueing' %
(src, ver, arch, trigsrc, trigver))
return return
self.requested_tests.setdefault(src, {}).setdefault( self.requested_tests.setdefault(src, {}).setdefault(
ver, set()).add((trigsrc, trigver)) ver, {}).setdefault(arch, set()).add((trigsrc, trigver))
# #
# obsolete adt-britney helpers # obsolete adt-britney helpers
@ -281,13 +284,15 @@ class AutoPackageTest(object):
for src, ver in packages: for src, ver in packages:
for (testsrc, testver) in self.tests_for_source(src, ver): for (testsrc, testver) in self.tests_for_source(src, ver):
if testsrc not in excludes: if testsrc not in excludes:
self.add_test_request(testsrc, testver, src, ver) for arch in self.britney.options.adt_arches.split():
self.add_test_request(testsrc, testver, arch, src, ver)
if self.britney.options.verbose: if self.britney.options.verbose:
for src, verinfo in self.requested_tests.items(): for src, verinfo in self.requested_tests.items():
for ver, triggers in verinfo.items(): for ver, archinfo in verinfo.items():
self.log_verbose('Requesting %s/%s autopkgtest to verify %s' % for arch, triggers in archinfo.items():
(src, ver, ', '.join(['%s/%s' % i for i in triggers]))) self.log_verbose('Requesting %s/%s/%s autopkgtest to verify %s' %
(src, ver, arch, ', '.join(['%s/%s' % i for i in triggers])))
# deprecated requests for old Jenkins/lp:auto-package-testing, will go # deprecated requests for old Jenkins/lp:auto-package-testing, will go
# away # away
@ -346,8 +351,9 @@ class AutoPackageTest(object):
def submit(self): def submit(self):
# send AMQP requests for new test requests # send AMQP requests for new test requests
# TODO: Once we support version constraints in AMQP requests, add them # TODO: Once we support version constraints in AMQP requests, add them
queues = ['debci-%s-%s' % (self.series, arch) arch_queues = {}
for arch in self.britney.options.adt_arches.split()] for arch in self.britney.options.adt_arches.split():
arch_queues[arch] = 'debci-%s-%s' % (self.series, arch)
try: try:
amqp_url = self.britney.options.adt_amqp amqp_url = self.britney.options.adt_amqp
@ -355,20 +361,27 @@ class AutoPackageTest(object):
self.log_error('ADT_AMQP not set, cannot submit requests') self.log_error('ADT_AMQP not set, cannot submit requests')
return return
def _arches(verinfo):
res = set()
for v, archinfo in verinfo.items():
res.update(archinfo.keys())
return res
if amqp_url.startswith('amqp://'): if amqp_url.startswith('amqp://'):
with kombu.Connection(amqp_url) as conn: with kombu.Connection(amqp_url) as conn:
for q in queues: for arch in arch_queues:
# don't use SimpleQueue here as it always declares queues; # don't use SimpleQueue here as it always declares queues;
# ACLs might not allow that # ACLs might not allow that
with kombu.Producer(conn, routing_key=q, auto_declare=False) as p: with kombu.Producer(conn, routing_key=arch_queues[arch], auto_declare=False) as p:
for pkg in self.requested_tests: for pkg, verinfo in self.requested_tests.items():
p.publish(pkg) if arch in _arches(verinfo):
p.publish(pkg)
elif amqp_url.startswith('file://'): elif amqp_url.startswith('file://'):
# in testing mode, adt_amqp will be a file:// URL # in testing mode, adt_amqp will be a file:// URL
with open(amqp_url[7:], 'a') as f: with open(amqp_url[7:], 'a') as f:
for pkg in self.requested_tests: for pkg, verinfo in self.requested_tests.items():
for q in queues: for arch in _arches(verinfo):
f.write('%s:%s\n' % (q, pkg)) f.write('%s:%s\n' % (arch_queues[arch], pkg))
else: else:
self.log_error('Unknown ADT_AMQP schema in %s' % self.log_error('Unknown ADT_AMQP schema in %s' %
self.britney.options.adt_amqp) self.britney.options.adt_amqp)

21
tests/test_autopkgtest.py
Unescape View File

@ -126,9 +126,12 @@ echo "$@" >> /%s/adt-britney.log ''' % self.data.path)
os.unlink(self.fake_amqp) os.unlink(self.fake_amqp)
# ... and that they get recorded as pending # ... and that they get recorded as pending
expected_pending = '''darkgreen 1 green 2 expected_pending = '''darkgreen 1 amd64 green 2
green 2 green 2 darkgreen 1 i386 green 2
lightgreen 1 green 2 green 2 amd64 green 2
green 2 i386 green 2
lightgreen 1 amd64 green 2
lightgreen 1 i386 green 2
''' '''
self.assertEqual(self.pending_requests, expected_pending) self.assertEqual(self.pending_requests, expected_pending)
@ -161,10 +164,14 @@ lightgreen 1 green 2
os.unlink(self.fake_amqp) os.unlink(self.fake_amqp)
# ... and that they get recorded as pending # ... and that they get recorded as pending
expected_pending = '''darkgreen 1 green 2 expected_pending = '''darkgreen 1 amd64 green 2
green 2 green 2 darkgreen 1 i386 green 2
lightgreen 2 green 2 green 2 amd64 green 2
lightgreen 2 lightgreen 2 green 2 i386 green 2
lightgreen 2 amd64 green 2
lightgreen 2 amd64 lightgreen 2
lightgreen 2 i386 green 2
lightgreen 2 i386 lightgreen 2
''' '''
self.assertEqual(self.pending_requests, expected_pending) self.assertEqual(self.pending_requests, expected_pending)

Write Preview
Loading…
Cancel
Save