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

[Andy Whitcroft]

When searching against a distribution we only actually will find tasks on
bugs open against development. This leads us to miss bugs which either
have a closed development task or have no development task at all. This
affects bugs in then development series which have no general development
task, and those nominated to older series and have a closed development
task. In particular these forms are seen with kernel tracking bugs.

Enhance the blocking bug search to search in both the distribution and
the associated 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.

[Łukasz Zemczak (sil2100)]

Ok, this is actually looking good. First I was a bit worried that this might be a bit slow, but then I saw it was slow from the start, and this can potentially make it faster (due to better handling of duplicate bugs from tasks).

One thing only to consider is what I wrote in my inline-comment - placement of the script. But I guess this is more cosmetics?

review: Approve

=== modified file 'britney'
--- britney	2019-10-18 12:54:51 +0000
+++ britney	2020-03-12 15:19:26 +0000
@@ -217,29 +217,38 @@
 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))
+block_detail = {}
+for task in tasks:
     target = task.target
     bug = task.bug
     if urlsplit(target.resource_type_link).fragment in (
             "distribution_source_package", "source_package"):
-        for action in reversed(
-                [a for a in bug.activity if a.whatchanged == "tags"]):
-            oldtags = action.oldvalue.split()
-            newtags = action.newvalue.split()
-            gained_block = False
-            for tag in tags:
-                if tag not in oldtags and tag in newtags:
-                    gained_block = True
+        date = block_detail.get(bug.id)
+        if date is None:
+            for action in reversed(
+                    [a for a in bug.activity if a.whatchanged == "tags"]):
+                oldtags = action.oldvalue.split()
+                newtags = action.newvalue.split()
+                gained_block = False
+                for tag in tags:
+                    if tag not in oldtags and tag in newtags:
+                        gained_block = True
+                        break
+                if gained_block:
+                    date = action.datechanged
                     break
-            if gained_block:
-                date = action.datechanged
-                break
-        else:
-            date = bug.date_created
-        print("%s %d %d" %
+            else:
+                date = bug.date_created
+            block_detail[bug.id] = date
+        blocks.add("%s %d %d" %
               (os.path.basename(target.self_link), bug.id,
                calendar.timegm(date.timetuple())))
-' "$LP_SERVICE" "$DISTRIBUTION" "$tags" >"$1/$SERIES-proposed/$output_file.new"
+print("\n".join(sorted(blocks)))
+' "$LP_SERVICE" "$DISTRIBUTION" "$tags" "$SERIES" >"$1/$SERIES-proposed/$output_file.new"
   mv "$1/$SERIES-proposed/$output_file.new" "$1/$SERIES-proposed/$output_file"
 }
 if option blocks; then