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

autopkgtest: Support autopkgtest.u.c in-progress URL

Browse Source 
This is at /running. We use 'are we running on swift?' as a proxy for
deciding which URL format to use
This commit is contained in:
Iain Lane 2020-06-04 15:59:49 +01:00 committed by Iain Lane
parent 113e197efa
commit 0f6b785d46
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
britney2/policies/autopkgtest.py
View File

@ -1167,7 +1167,10 @@ class AutopkgtestPolicy(BasePolicy):
result = 'RUNNING' result = 'RUNNING'
else: else:
result = 'RUNNING-ALWAYSFAIL' result = 'RUNNING-ALWAYSFAIL'
url = self.options.adt_ci_url + 'status/pending' if self.options.adt_swift_url.startswith('file://'):
url = self.options.adt_ci_url + 'status/pending'
else:
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))

4
tests/test_autopkgtest.py
View File

@ -255,12 +255,12 @@ class AT(TestAutopkgtestBase):
self.assertEqual(exc['darkgreen']['policy_info']['autopkgtest'], self.assertEqual(exc['darkgreen']['policy_info']['autopkgtest'],
{'darkgreen': { {'darkgreen': {
'amd64': ['RUNNING-ALWAYSFAIL', 'amd64': ['RUNNING-ALWAYSFAIL',
'https://autopkgtest.ubuntu.com/status/pending', 'https://autopkgtest.ubuntu.com/running',
'https://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',
'https://autopkgtest.ubuntu.com/status/pending', 'https://autopkgtest.ubuntu.com/running',
'https://autopkgtest.ubuntu.com/packages/d/darkgreen/testing/i386', 'https://autopkgtest.ubuntu.com/packages/d/darkgreen/testing/i386',
None, None,
None]}, None]},