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

This is at /running. We use 'are we running on swift?' as a proxy for
deciding which URL format to use
ubuntu/rebased
Iain Lane 5 years ago committed by Iain Lane
parent 92854c72c6
commit c1177a331a
No known key found for this signature in database
GPG Key ID: E352D5C51C5041D4

@ -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))

@ -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]},

Loading…
Cancel
Save