Merge lp:~apw/britney/britney1-ubuntu--fix-stable-blocks into lp:~ubuntu-release/britney/britney1-ubuntu

[Andy Whitcroft]

Fix launchpad bug block searches for stable series.

[Colin Watson (cjwatson)]

You could do rather less work by having `blocks` be a dict mapping bug IDs to the rest of the information, checking early in the loop whether task.bug.id is in the dict already, and handling the formatting at the end. But this looks fine even without that.

review: Approve

Unmerged revisions

310. By Andy Whitcroft on 2017-10-17

britney: identify bug blocks against the nominated series as well as devel

When searching against the development series bugs which are closed in
the development series but open in a specific older series the bugs are
not listed. This leads us to miss blocks in stable releases in particular
this form is seen with kernel tracking bugs.

Enhance the blocking bug search to search in both development and in
the nominated series.

This has been run in unit-test against development and produces the same
block list there. It has been tested against the current live stable
releases and seems to produce believeable block lists, and significantly
longer ones in those releases.

Signed-off-by: Andy Whitcroft <email address hidden>

=== modified file 'britney'
--- britney	2017-04-21 21:25:08 +0000
+++ britney	2017-10-17 14:06:06 +0000
@@ -172,12 +172,15 @@
 
 blocks () {
   local tags
+  local series
   [ "$DISTRIBUTION" = ubuntu ] || return 0
   mkdir -p "$1/$SERIES-proposed"
   if [ "$SERIES" = "$DEFAULT_SERIES" ]; then
     tags="block-proposed block-proposed-$SERIES"
+    series="devel"
   else
     tags="block-proposed-$SERIES"
+    series="$SERIES"
   fi
   python -c '
 from __future__ import print_function
@@ -207,7 +210,11 @@
 launchpad = Launchpad.login_with("proposed-migration", sys.argv[1])
 distro = launchpad.distributions[sys.argv[2]]
 tags = sys.argv[3].split()
-for task in distro.searchTasks(omit_targeted=False, tags=tags):
+series = distro.getSeries(name_or_version=sys.argv[4])
+blocks = set()
+tasks = list(series.searchTasks(omit_targeted=False, tags=tags))
+tasks += list(distro.searchTasks(omit_targeted=False, tags=tags))
+for task in tasks:
     target = task.target
     bug = task.bug
     if urlsplit(target.resource_type_link).fragment in (
@@ -226,10 +233,11 @@
                 break
         else:
             date = bug.date_created
-        print("%s %d %d" %
+        blocks.add("%s %d %d" %
               (os.path.basename(target.self_link), bug.id,
                calendar.timegm(date.timetuple())))
-' "$LP_SERVICE" "$DISTRIBUTION" "$tags" >"$1/$SERIES-proposed/Blocks.new"
+print("\n".join(sorted(blocks)))
+' "$LP_SERVICE" "$DISTRIBUTION" "$tags" "$series" >"$1/$SERIES-proposed/Blocks.new"
   mv "$1/$SERIES-proposed/Blocks.new" "$1/$SERIES-proposed/Blocks"
 }
 if option blocks; then