Merge lp:~vorlon/ubuntu-archive-tools/fancier-autopkgtest-retries into lp:ubuntu-archive-tools

[Steve Langasek]

[lp:~vorlon/ubuntu-archive-tools/fancier-autopkgtest-retries]

1138. By Steve Langasek on 2017-12-19

Add --no-proposed option to retry-autopkgtest-regressions

This option permutes the triggers on retry to run each test against its own
package, instead of against the original triggering package, to let us get a
baseline for the autopkgtest against the release.

This relies on information within update_excuses itself to know what the
right substitute trigger will be.

Unmerged revisions

1138. By Steve Langasek on 2017-12-19

Add --no-proposed option to retry-autopkgtest-regressions

This option permutes the triggers on retry to run each test against its own
package, instead of against the original triggering package, to let us get a
baseline for the autopkgtest against the release.

This relies on information within update_excuses itself to know what the
right substitute trigger will be.

1137. By Steve Langasek on 2017-12-19

Add --blocks option to retry-autopkgtest-regressions

This will filter the list of tests to only those which were triggered by the
named package. This is a useful optimization over having to assemble your
own grep/sed pipeline for this common case.

It is also a necessary first step towards being able to support triggering
retries of failed tests against the release pocket, because in that case the
original triggering package name would no longer appear in the output and
you wouldn't be able to filter with grep.

=== modified file 'retry-autopkgtest-regressions'
--- retry-autopkgtest-regressions	2017-10-25 07:45:54 +0000
+++ retry-autopkgtest-regressions	2017-12-19 20:52:57 +0000
@@ -22,6 +22,7 @@
 import urllib.request
 import urllib.parse
 import argparse
+import re
 import yaml
 import json
 
@@ -57,12 +58,21 @@
     parser.add_argument('--min-age', type=float, metavar='DAYS',
                         help='only consider candiates which are at least '
                         'this number of days old (float allowed)')
+    parser.add_argument('--blocks',
+                        help='rerun only those tests that were triggered '
+                        'by the named package')
+    parser.add_argument('--no-proposed', action='store_true',
+                        help='run tests against release+updates instead of '
+                        'against proposed, to re-establish a baseline for the '
+                        'test.  This currently only works for packages that '
+                        'do not themselves have a newer version in proposed.')
     args = parser.parse_args()
 
     return args
 
 
-def get_regressions(excuses_url, release, retry_state, min_age, max_age):
+def get_regressions(excuses_url, release, retry_state, min_age, max_age,
+                    blocks, no_proposed):
     '''Return dictionary with regressions
 
     Return dict: release → pkg → arch → [trigger, ...]
@@ -72,6 +82,8 @@
         excuses = yaml.load(f)
     regressions = {}
     for excuse in excuses['sources']:
+        if blocks and blocks != excuse['source']:
+            continue
         try:
             age = excuse['policy_info']['age']['current-age']
         except KeyError:
@@ -83,8 +95,11 @@
         if max_age is not None and age is not None and age > max_age:
             break
         for pkg, archinfo in excuse.get('policy_info', {}).get('autopkgtest', {}).items():
-            pkg = pkg.split('/')[0].split()[0]  # strip off version (either / or space separated)
-            trigger = excuse['source'] + '/' + excuse['new-version']
+            pkg, pkg_ver = re.split('[ /]+', pkg, 1) # split off version (either / or space separated)
+            if no_proposed:
+                trigger = pkg + '/' + pkg_ver
+            else:
+                trigger = excuse['source'] + '/' + excuse['new-version']
             for arch, state in archinfo.items():
                 if state[0] == retry_state:
                     regressions.setdefault(release, {}).setdefault(
@@ -118,7 +133,8 @@
 else:
     excuses_url = 'http://people.canonical.com/~ubuntu-archive/proposed-migration/%s/update_excuses.yaml' % args.series
 regressions = get_regressions(excuses_url, args.series, args.state,
-                              args.min_age, args.max_age)
+                              args.min_age, args.max_age, args.blocks,
+                              args.no_proposed)
 
 for release, pkgmap in regressions.items():
     for pkg, archmap in pkgmap.items():