Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-06-04 22:31:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make autopkgtest web site URL an option

Browse Source
This commit is contained in:
Paul Gevers 2017-10-13 11:41:05 +02:00
parent 1b9fb374a2
commit acec564443
No known key found for this signature in database
GPG Key ID: 9C5C99EB05BD750A
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
britney.conf
View File

@ -92,3 +92,5 @@ ADT_SHARED_RESULTS_CACHE =
# Swift base URL with the results (must be publicly readable and browsable) # Swift base URL with the results (must be publicly readable and browsable)
# or file location if results are pre-fetched # or file location if results are pre-fetched
ADT_SWIFT_URL = file:///srv/release.debian.org/britney/state/debci.json ADT_SWIFT_URL = file:///srv/release.debian.org/britney/state/debci.json
# Base URL for autopkgtest site, used for links in the excuses
ADT_CI_URL = https://ci.debian.net/

7
britney2/policies/autopkgtest.py
View File

@ -201,8 +201,7 @@ class AutopkgtestPolicy(BasePolicy):
# add test result details to Excuse # add test result details to Excuse
verdict = PolicyVerdict.PASS verdict = PolicyVerdict.PASS
# TODO: should be generic / an option cloud_url = self.options.adt_ci_url + "packages/%(h)s/%(s)s/%(r)s/%(a)s"
cloud_url = "http://autopkgtest.ubuntu.com/packages/%(h)s/%(s)s/%(r)s/%(a)s"
for (testsrc, testver) in sorted(pkg_arch_result): for (testsrc, testver) in sorted(pkg_arch_result):
arch_results = pkg_arch_result[(testsrc, testver)] arch_results = pkg_arch_result[(testsrc, testver)]
r = set([v[0] for v in arch_results.values()]) r = set([v[0] for v in arch_results.values()])
@ -228,7 +227,7 @@ class AutopkgtestPolicy(BasePolicy):
'h': srchash(testsrc), 's': testsrc, 'h': srchash(testsrc), 's': testsrc,
'r': self.options.series, 'a': arch} 'r': self.options.series, 'a': arch}
if status == 'REGRESSION': if status == 'REGRESSION':
retry_url = 'https://autopkgtest.ubuntu.com/request.cgi?' + \ retry_url = self.options.adt_ci_url + 'request.cgi?' + \
urllib.parse.urlencode([('release', self.options.series), urllib.parse.urlencode([('release', self.options.series),
('arch', arch), ('arch', arch),
('package', testsrc), ('package', testsrc),
@ -741,7 +740,7 @@ class AutopkgtestPolicy(BasePolicy):
result = 'RUNNING' result = 'RUNNING'
else: else:
result = 'RUNNING-ALWAYSFAIL' result = 'RUNNING-ALWAYSFAIL'
url = 'http://autopkgtest.ubuntu.com/running' url = self.options.adt_ci_url + 'running'
else: else:
raise RuntimeError('Result for %s/%s/%s (triggered by %s) is neither known nor pending!' % raise RuntimeError('Result for %s/%s/%s (triggered by %s) is neither known nor pending!' %
(src, ver, arch, trigger)) (src, ver, arch, trigger))

1
tests/__init__.py
View File

@ -389,6 +389,7 @@ ADT_PPAS =
ADT_SHARED_RESULTS_CACHE = ADT_SHARED_RESULTS_CACHE =
ADT_SWIFT_URL = http://localhost:18085 ADT_SWIFT_URL = http://localhost:18085
ADT_CI_URL = https://autopkgtest.ubuntu.com/
''') ''')
assert os.path.exists(self.britney) assert os.path.exists(self.britney)

16
tests/test_autopkgtest.py
View File

@ -210,13 +210,13 @@ class T(TestBase):
self.assertEqual(exc['darkgreen']['policy_info']['autopkgtest'], self.assertEqual(exc['darkgreen']['policy_info']['autopkgtest'],
{'darkgreen': { {'darkgreen': {
'amd64': ['RUNNING-ALWAYSFAIL', 'amd64': ['RUNNING-ALWAYSFAIL',
'http://autopkgtest.ubuntu.com/running', 'https://autopkgtest.ubuntu.com/running',
'http://autopkgtest.ubuntu.com/packages/d/darkgreen/testing/amd64', 'https://autopkgtest.ubuntu.com/packages/d/darkgreen/testing/amd64',
None, None,
None], None],
'i386': ['RUNNING-ALWAYSFAIL', 'i386': ['RUNNING-ALWAYSFAIL',
'http://autopkgtest.ubuntu.com/running', 'https://autopkgtest.ubuntu.com/running',
'http://autopkgtest.ubuntu.com/packages/d/darkgreen/testing/i386', 'https://autopkgtest.ubuntu.com/packages/d/darkgreen/testing/i386',
None, None,
None]}, None]},
'verdict': 'PASS'}) 'verdict': 'PASS'})
@ -499,7 +499,7 @@ class T(TestBase):
self.assertEqual(exc['green']['policy_info']['autopkgtest']['lightgreen/1']['amd64'][:4], self.assertEqual(exc['green']['policy_info']['autopkgtest']['lightgreen/1']['amd64'][:4],
['REGRESSION', ['REGRESSION',
'http://localhost:18085/autopkgtest-testing/testing/amd64/l/lightgreen/20150101_100101@/log.gz', 'http://localhost:18085/autopkgtest-testing/testing/amd64/l/lightgreen/20150101_100101@/log.gz',
'http://autopkgtest.ubuntu.com/packages/l/lightgreen/testing/amd64', 'https://autopkgtest.ubuntu.com/packages/l/lightgreen/testing/amd64',
None]) None])
# should have retry link for the regressions (not a stable URL, test # should have retry link for the regressions (not a stable URL, test
@ -2217,12 +2217,12 @@ class T(TestBase):
self.assertEqual(exc['lightgreen']['policy_info']['autopkgtest'], self.assertEqual(exc['lightgreen']['policy_info']['autopkgtest'],
{'lightgreen': { {'lightgreen': {
'amd64': ['RUNNING-ALWAYSFAIL', 'amd64': ['RUNNING-ALWAYSFAIL',
'http://autopkgtest.ubuntu.com/running', 'https://autopkgtest.ubuntu.com/running',
None, None,
None, None,
None], None],
'i386': ['RUNNING-ALWAYSFAIL', 'i386': ['RUNNING-ALWAYSFAIL',
'http://autopkgtest.ubuntu.com/running', 'https://autopkgtest.ubuntu.com/running',
None, None,
None, None,
None]}, None]},
@ -2438,7 +2438,7 @@ class T(TestBase):
link = urllib.parse.urlparse(exc['green']['policy_info']['autopkgtest']['lightgreen/1']['amd64'][1]) link = urllib.parse.urlparse(exc['green']['policy_info']['autopkgtest']['lightgreen/1']['amd64'][1])
self.assertEqual(link.path, os.path.join(debci_file, 'autopkgtest-testing/testing/amd64/l/lightgreen/20170917_101001/log.gz')) self.assertEqual(link.path, os.path.join(debci_file, 'autopkgtest-testing/testing/amd64/l/lightgreen/20170917_101001/log.gz'))
self.assertEqual(exc['green']['policy_info']['autopkgtest']['lightgreen/1']['amd64'][2:4], self.assertEqual(exc['green']['policy_info']['autopkgtest']['lightgreen/1']['amd64'][2:4],
['http://autopkgtest.ubuntu.com/packages/l/lightgreen/testing/amd64', ['https://autopkgtest.ubuntu.com/packages/l/lightgreen/testing/amd64',
None]) None])
# should have retry link for the regressions (not a stable URL, test # should have retry link for the regressions (not a stable URL, test