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

Add retry links to PPA excuses

Browse Source 
autopkgtest-retrier supports "ppa=" GET arguments now.
This commit is contained in:
Martin Pitt 2016-02-04 21:54:53 +01:00
parent b5fd32ec7b
commit b20421efc3
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
britney.py
View File

@ -1961,10 +1961,11 @@ class Britney(object):
'r': self.options.series, 'a': arch} 'r': self.options.series, 'a': arch}
if status == 'REGRESSION': if status == 'REGRESSION':
kwargs['retry_url'] = 'https://autopkgtest.ubuntu.com/retry.cgi?' + \ kwargs['retry_url'] = 'https://autopkgtest.ubuntu.com/retry.cgi?' + \
urlencode({'release': self.options.series, urlencode([('release', self.options.series),
'arch': arch, ('arch', arch),
'package': adtsrc, ('package', adtsrc),
'trigger': '%s/%s' % (e.name, e.ver[1])}) ('trigger', '%s/%s' % (e.name, e.ver[1]))] +
[('ppa', p) for p in self.options.adt_ppas])
e.addtest('autopkgtest', '%s %s' % (adtsrc, adtver), e.addtest('autopkgtest', '%s %s' % (adtsrc, adtver),
arch, status, log_url, **kwargs) arch, status, log_url, **kwargs)

9
tests/test_autopkgtest.py
View File

@ -1625,13 +1625,14 @@ class T(TestBase):
# add results to PPA specific swift container # add results to PPA specific swift container
self.swift.set_results({'autopkgtest-series-awesome-developers-staging': { self.swift.set_results({'autopkgtest-series-awesome-developers-staging': {
'series/i386/l/lightgreen/20150101_100100@': (0, 'lightgreen 2', tr('lightgreen/2')), 'series/i386/l/lightgreen/20150101_100000@': (0, 'lightgreen 1', tr('passedbefore/1')),
'series/i386/l/lightgreen/20150101_100100@': (4, 'lightgreen 2', tr('lightgreen/2')),
'series/amd64/l/lightgreen/20150101_100101@': (0, 'lightgreen 2', tr('lightgreen/2')), 'series/amd64/l/lightgreen/20150101_100101@': (0, 'lightgreen 2', tr('lightgreen/2')),
}}) }})
exc = self.do_test( exc = self.do_test(
[], [],
{'lightgreen': (True, {'lightgreen 2': {'i386': 'PASS', 'amd64': 'PASS'}})}, {'lightgreen': (False, {'lightgreen 2': {'i386': 'REGRESSION', 'amd64': 'PASS'}})},
{'lightgreen': [('old-version', '1'), ('new-version', '2')]} {'lightgreen': [('old-version', '1'), ('new-version', '2')]}
)[1] )[1]
self.assertEqual(exc['lightgreen']['tests'], {'autopkgtest': self.assertEqual(exc['lightgreen']['tests'], {'autopkgtest':
@ -1641,11 +1642,11 @@ class T(TestBase):
None, None,
'http://localhost:18085/autopkgtest-series-awesome-developers-staging/series/amd64/l/lightgreen/20150101_100101@/artifacts.tar.gz', 'http://localhost:18085/autopkgtest-series-awesome-developers-staging/series/amd64/l/lightgreen/20150101_100101@/artifacts.tar.gz',
None], None],
'i386': ['PASS', 'i386': ['REGRESSION',
'http://localhost:18085/autopkgtest-series-awesome-developers-staging/series/i386/l/lightgreen/20150101_100100@/log.gz', 'http://localhost:18085/autopkgtest-series-awesome-developers-staging/series/i386/l/lightgreen/20150101_100100@/log.gz',
None, None,
'http://localhost:18085/autopkgtest-series-awesome-developers-staging/series/i386/l/lightgreen/20150101_100100@/artifacts.tar.gz', 'http://localhost:18085/autopkgtest-series-awesome-developers-staging/series/i386/l/lightgreen/20150101_100100@/artifacts.tar.gz',
None]} 'https://autopkgtest.ubuntu.com/retry.cgi?release=series&arch=i386&package=lightgreen&trigger=lightgreen%2F2&ppa=joe%2Ffoo&ppa=awesome-developers%2Fstaging']}
}}) }})
self.assertEqual(self.amqp_requests, set()) self.assertEqual(self.amqp_requests, set())
self.assertEqual(self.pending_requests, {}) self.assertEqual(self.pending_requests, {})