Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-02-12 15:07:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make retry URL configurable (two flavors)

Browse Source
This commit is contained in:
Paul Gevers 2018-04-02 07:39:06 +02:00
parent 9a28ec184b
commit def9d81c76
No known key found for this signature in database
GPG Key ID: 9C5C99EB05BD750A
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
britney.conf
View File

@ -101,3 +101,4 @@ ADT_CI_URL = https://ci.debian.net/
ADT_REGRESSION_PENALTY = 10
ADT_SUCCESS_BOUNTY = 3
ADT_BASELINE = reference
ADT_RETRY_URL_MECH = run_id

3
britney.py
View File

@ -553,6 +553,9 @@ class Britney(object):
self.options.ignore_cruft == "0":
self.options.ignore_cruft = False
if not hasattr(self.options, 'adt_retry_url_mech'):
self.options.adt_retry_url_mech = ''
self.policies.append(RCBugPolicy(self.options, self.suite_info))
self.policies.append(PiupartsPolicy(self.options, self.suite_info))
if getattr(self.options, 'adt_enable') == 'yes':

28
britney2/policies/autopkgtest.py
View File

@ -228,8 +228,8 @@ class AutopkgtestPolicy(BasePolicy):
pass
for (testsrc, testver) in tests:
self.pkg_test_request(testsrc, arch, trigger, huge=is_huge)
(result, real_ver, url) = self.pkg_test_result(testsrc, testver, arch, trigger)
pkg_arch_result.setdefault((testsrc, real_ver), {})[arch] = (result, url)
(result, real_ver, run_id, url) = self.pkg_test_result(testsrc, testver, arch, trigger)
pkg_arch_result.setdefault((testsrc, real_ver), {})[arch] = (result, run_id, url)
# add test result details to Excuse
cloud_url = self.options.adt_ci_url + "packages/%(h)s/%(s)s/%(r)s/%(a)s"
@ -252,7 +252,7 @@ class AutopkgtestPolicy(BasePolicy):
html_archmsg = []
for arch in sorted(arch_results):
(status, log_url) = arch_results[arch]
(status, run_id, log_url) = arch_results[arch]
artifact_url = None
retry_url = None
history_url = None
@ -264,12 +264,15 @@ class AutopkgtestPolicy(BasePolicy):
'h': srchash(testsrc), 's': testsrc,
'r': self.options.series, 'a': arch}
if status == 'REGRESSION':
retry_url = self.options.adt_ci_url + 'request.cgi?' + \
urllib.parse.urlencode([('release', self.options.series),
('arch', arch),
('package', testsrc),
('trigger', trigger)] +
[('ppa', p) for p in self.options.adt_ppas])
if self.options.adt_retry_url_mech == 'run_id':
retry_url = self.options.adt_ci_url + 'api/v1/retry/' + run_id
else:
retry_url = self.options.adt_ci_url + 'request.cgi?' + \
urllib.parse.urlencode([('release', self.options.series),
('arch', arch),
('package', testsrc),
('trigger', trigger)] +
[('ppa', p) for p in self.options.adt_ppas])
if testver:
testname = '%s/%s' % (testsrc, testver)
else:
@ -767,12 +770,13 @@ class AutopkgtestPolicy(BasePolicy):
def pkg_test_result(self, src, ver, arch, trigger):
'''Get current test status of a particular package
Return (status, real_version, log_url) tuple; status is a key in
EXCUSES_LABELS. log_url is None if the test is still running.
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.
'''
# determine current test result status
ever_passed = self.passed_in_baseline(src, arch)
url = None
run_id = None
try:
r = self.test_results[trigger][src][arch]
ver = r[1]
@ -827,7 +831,7 @@ class AutopkgtestPolicy(BasePolicy):
raise RuntimeError('Result for %s/%s/%s (triggered by %s) is neither known nor pending!' %
(src, ver, arch, trigger))
return (result, ver, url)
return (result, ver, run_id, url)
def has_force_badtest(self, src, ver, arch):
'''Check if src/ver/arch has a force-badtest hint'''