Merge lp:~laney/ubuntu-archive-tools/r-a-r-excuses-xz into lp:ubuntu-archive-tools

[Iain Lane]

[lp:~laney/ubuntu-archive-tools/r-a-r-excuses-xz]

1340. By Iain Lane on 2020-07-01

retry-autopkgtest-regressions: Try update_excuses.yaml.xz before update_excuses.yaml

The upcoming proposed-migration deployment will use this filename.

[Steve Langasek (vorlon)]

review: Approve

=== modified file 'retry-autopkgtest-regressions'
--- retry-autopkgtest-regressions	2020-06-30 23:08:20 +0000
+++ retry-autopkgtest-regressions	2020-07-01 16:28:42 +0000
@@ -25,6 +25,7 @@
 import urllib.request
 import urllib.parse
 import argparse
+import lzma
 import os
 import re
 import yaml
@@ -108,7 +109,15 @@
         prev_timestamp = datetime.fromtimestamp(prev_mtime, tz=tzutc())
         new_timestamp = datetime.now(tz=tzutc()).timestamp()
 
-    f = urllib.request.urlopen(excuses_url)
+    try:
+        f = lzma.open(urllib.request.urlopen(excuses_url))
+    except urllib.error.HTTPError as e:
+        if e.code == 404:
+            # some versions of britney output this file uncompressed, try that
+            # location too
+            f = urllib.request.urlopen(excuses_url.rstrip('.xz'))
+        else:
+            raise
     if cache_file:
         remote_ts = dateutil.parser.parse(f.headers['last-modified'])
         if remote_ts > prev_timestamp:
@@ -177,11 +186,11 @@
             break
     if excuses_url.startswith('/'):
         excuses_url = url_root + excuses_url
-    excuses_url = excuses_url.replace('.html', '.yaml')
+    excuses_url = excuses_url.replace('.html', '.yaml.xz')
     extra_params += [('ppa', 'ci-train-ppa-service/stable-phone-overlay'),
                      ('ppa', 'ci-train-ppa-service/%s' % ppa_name)]
 else:
-    excuses_url = 'http://people.canonical.com/~ubuntu-archive/proposed-migration/%s/update_excuses.yaml' % args.series
+    excuses_url = 'http://people.canonical.com/~ubuntu-archive/proposed-migration/%s/update_excuses.yaml.xz' % args.series
 regressions = get_regressions(excuses_url, args.series, args.state,
                               args.min_age, args.max_age, args.blocks,
                               args.no_proposed)