Merge ~jbicha/britney/+git/https-autopkgtest:master into ~ubuntu-release/britney/+git/britney2-ubuntu:master

[Jeremy Bícha]

Unmerged commits

9dfab29... by Jeremy Bícha on 2018-05-09

Use https for autopkgtest.ubuntu.com

c3fe5dc... by Iain Lane on 2018-05-02

run-autopkgtest: Pass SUDO_USER as the requester if it's set

No place to hide

100a3f4... by Steve Langasek on 2018-04-09

adjust variable name for ubuntu-sru as well

336b115... by Steve Langasek on 2018-04-09

adjust variable name so that hints files can reflect actual team names

82b448e... by Steve Langasek on 2018-04-08

devel series hints are governed by the release team, not the archive team

88b4d02... by Mathieu Trudel-Lapierre on 2018-03-08

Use the CSafeLoader YAML loader to catch issues with complex objects

b16530a... by Mathieu Trudel-Lapierre on 2018-03-08

Flatten the defaultdict(set) for unsat_deps into a standard dict for output

f32907a... by Mathieu Trudel-Lapierre on 2018-03-08

Fix review issues.

80bf906... by Mathieu Trudel-Lapierre on 2018-03-06

Re-add 'unsatisfiable dependencies' information which dropped with the excuses key.

94bffad... by Steve Langasek on 2018-03-03

As near as I can tell, the 'excuses' element within the yaml data is a
complete duplication of other structured data elsewhere in the yaml, and
does nothing but slow down the yaml parsing. So, just avoid emitting it.

diff --git a/britney2/policies/autopkgtest.py b/britney2/policies/autopkgtest.py
index 806debd..03e7162 100644
--- a/britney2/policies/autopkgtest.py
+++ b/britney2/policies/autopkgtest.py
@@ -188,7 +188,7 @@ class AutopkgtestPolicy(BasePolicy):
 
         # add test result details to Excuse
         verdict = PolicyVerdict.PASS
-        cloud_url = "http://autopkgtest.ubuntu.com/packages/%(h)s/%(s)s/%(r)s/%(a)s"
+        cloud_url = "https://autopkgtest.ubuntu.com/packages/%(h)s/%(s)s/%(r)s/%(a)s"
         for (testsrc, testver) in sorted(pkg_arch_result):
             arch_results = pkg_arch_result[(testsrc, testver)]
             r = set([v[0] for v in arch_results.values()])
@@ -717,7 +717,7 @@ class AutopkgtestPolicy(BasePolicy):
                     result = 'RUNNING'
                 else:
                     result = 'RUNNING-ALWAYSFAIL'
-                url = 'http://autopkgtest.ubuntu.com/running'
+                url = 'https://autopkgtest.ubuntu.com/running'
             else:
                 raise RuntimeError('Result for %s/%s/%s (triggered by %s) is neither known nor pending!' %
                                    (src, ver, arch, trigger))
diff --git a/tests/test_autopkgtest.py b/tests/test_autopkgtest.py
index bc736ae..26ff3c6 100755
--- a/tests/test_autopkgtest.py
+++ b/tests/test_autopkgtest.py
@@ -231,13 +231,13 @@ class T(TestBase):
         self.assertEqual(exc['darkgreen']['policy_info']['autopkgtest'],
                          {'darkgreen': {
                              'amd64': ['RUNNING-ALWAYSFAIL',
-                                       'http://autopkgtest.ubuntu.com/running',
-                                       'http://autopkgtest.ubuntu.com/packages/d/darkgreen/series/amd64',
+                                       'https://autopkgtest.ubuntu.com/running',
+                                       'https://autopkgtest.ubuntu.com/packages/d/darkgreen/series/amd64',
                                        None,
                                        None],
                              'i386': ['RUNNING-ALWAYSFAIL',
-                                      'http://autopkgtest.ubuntu.com/running',
-                                      'http://autopkgtest.ubuntu.com/packages/d/darkgreen/series/i386',
+                                      'https://autopkgtest.ubuntu.com/running',
+                                      'https://autopkgtest.ubuntu.com/packages/d/darkgreen/series/i386',
                                       None,
                                       None]}})
 
@@ -507,7 +507,7 @@ class T(TestBase):
         self.assertEqual(exc['green']['policy_info']['autopkgtest']['lightgreen/1']['amd64'][:4],
                          ['REGRESSION',
                           'http://localhost:18085/autopkgtest-series/series/amd64/l/lightgreen/20150101_100101@/log.gz',
-                          'http://autopkgtest.ubuntu.com/packages/l/lightgreen/series/amd64',
+                          'https://autopkgtest.ubuntu.com/packages/l/lightgreen/series/amd64',
                           None])
 
         # should have retry link for the regressions (not a stable URL, test
@@ -2065,12 +2065,12 @@ class T(TestBase):
         self.assertEqual(exc['lightgreen']['policy_info']['autopkgtest'],
                          {'lightgreen': {
                              'amd64': ['RUNNING-ALWAYSFAIL',
-                                       'http://autopkgtest.ubuntu.com/running',
+                                       'https://autopkgtest.ubuntu.com/running',
                                        None,
                                        None,
                                        None],
                              'i386': ['RUNNING-ALWAYSFAIL',
-                                      'http://autopkgtest.ubuntu.com/running',
+                                      'https://autopkgtest.ubuntu.com/running',
                                       None,
                                       None,
                                       None]}