Merge lp:~laney/arsenal/champagne into lp:arsenal

[Iain Lane]

ls-ubuntu-tag-json: If we're generating 'rls-ff-incoming' bugs, include 'champagne' bugs too

This is a Canonical initiative to improve quality of the 20.04 release. It makes most sense to handle these bugs as if they were release tagged.

This is my proposal for how to handle the 'champagne' bugs. This is a one-time thing so I think it's OK to special case it.

I haven't been able to test this fully since I can't work out how to run all the scripts in order to produce a HTML report. I don't even know if this is the right script!

(If you like, add me to the ubuntureports user and I'll be able to poke directly to self-teach.)

[Brian Murray (brian-murray)]

The ls-ubuntu-tag-json code is actually for a different report. The reports rls-** reports are generated by "scripts/collect-bug-data" which is passed a json file with search criteria. That criteria follows:

    "search_criteria": [
        {
            "distribution": "ubuntu",
            "series": [
                "focal",
                "NONE"
            ],
            "status": [
                "New",
                "Confirmed",
                "Triaged",
                "Incomplete",
                "Incomplete (with response)",
                "Incomplete (without response)",
                "In Progress",
                "Fix Committed"
            ],
            "tags": [
                "rls-ff-incoming",
                "-rls-ff-notfixing"
            ],
            "tags_combinator": "All"
        }
    ],

Adding in 'champagne' as an additional filter to the search isn't a trivial matter because we want to search for bugs that are tagged 'rls-ff-incoming' and not '-rls-ff-notfixing' so we are using an and search in Launchpad. That being said if a bug is tagged 'rls-ff-incoming' and 'rls-ff-notifixing' I think something has failed in the rls bug process as when you tag it notfixing you should remove the incoming tag. So I'm just gonna modify the search to include champagne.

[Brian Murray (brian-murray)]

I did searches in LP for anything tagged rls-ff-incoming and rls-ff-notfixing (ee and bb too) and there was nothing so this really does make sense.

Unmerged revisions

1150. By Iain Lane on 2020-02-06

ls-ubuntu-tag-json: If we're generating 'rls-ff-incoming' bugs, include 'champagne' bugs too

This is a Canonical initiative to improve quality of the 20.04 release. It
makes most sense to handle these bugs as if they were release tagged.

1149. By Iain Lane on 2020-02-06

ls-ubuntu-tag-json: Store the bugs in a dict keyed by bug ID

The next change will look at multiple tags, and we need to avoid outputting the
same bug twice.

=== modified file 'scripts/ls-ubuntu-tag-json.py'
--- scripts/ls-ubuntu-tag-json.py	2011-12-06 02:31:26 +0000
+++ scripts/ls-ubuntu-tag-json.py	2020-02-06 11:19:25 +0000
@@ -32,7 +32,7 @@
 try:
     lp          = LaunchpadService(config={'read_only':True})
     project     = lp.launchpad.distributions["ubuntu"]
-    records     = []
+    records     = {}
 except:
     sys.exit(7)
 
@@ -41,7 +41,11 @@
         project = lp.launchpad.distributions["ubuntu"]
     for bugtask in project.searchTasks(tags=tag):
         bug = ArsenalBug(bugtask.bug, lp.launchpad)
-        records.append(bugtask_as_dict(bug, bugtask))
+        records[bug.id] = bugtask_as_dict(bug, bugtask)
+    if tag == 'rls-ff-incoming':
+        for bugtask in project.searchTasks(tags='champagne'):
+            bug = ArsenalBug(bugtask.bug, lp.launchpad)
+            records[bug.id] = bugtask_as_dict(bug, bugtask)
 except:
     # If launchpad threw an exception, it's probably just LP being down.
     # We'll catch up next time we run
@@ -51,7 +55,7 @@
 
 report = {
     'keys'      : [ 'id', 'title', 'target', 'importance', 'status', 'heat' ],
-    'bug_tasks' : records
+    'bug_tasks' : records.values()
 }
 
 print json.dumps(report, indent=4)