Rename taskGroupId to coverageIngestionTaskGroupId to disambiguate between Firefox CI task groups and coverage ingestion task groups

marco-c · marco-c · commit 635603b7f2e6 · 2026-03-11T10:46:17.000+01:00
diff --git a/bot/code_coverage_bot/trigger_missing.py b/bot/code_coverage_bot/trigger_missing.py
@@ -39,7 +39,7 @@ def trigger_task(task_group_id: str, revision: str) -> None:
         {
             "REPOSITORY": config.MOZILLA_CENTRAL_REPOSITORY,
             "REVISION": revision,
-            "taskGroupId": task_group_id,
+            "coverageIngestionTaskGroupId": task_group_id,
             "taskName": "covdir for {}".format(revision),
         },
     )
diff --git a/bot/tests/test_hook.py b/bot/tests/test_hook.py
@@ -17,7 +17,7 @@
         {
             "firedBy": "triggerHook",
             "taskId": "xxx",
-            "payload": {"taskName": "Custom task name", "taskGroupId": "yyyy"},
+            "payload": {"taskName": "Custom task name", "coverageTaskGroupId": "yyyy"},
         },
     ),
     # Cron trigger
diff --git a/bot/tests/test_trigger_missing.py b/bot/tests/test_trigger_missing.py
@@ -92,7 +92,7 @@ def triggerHook(self, hook_group, hook_id, payload):
                 assert payload == {
                     "REPOSITORY": "https://hg.mozilla.org/mozilla-central",
                     "REVISION": rev,
-                    "taskGroupId": "myGroupId",
+                    "coverageIngestionTaskGroupId": "myGroupId",
                     "taskName": f"covdir for {rev}",
                 }
                 trigger_hook_calls += 1
@@ -124,15 +124,15 @@ def get_task_details(decision_task_id):
         if get_task_details_calls == 0:
             assert decision_task_id == f"decisionTask-{revision5}"
             get_task_details_calls += 1
-            return {"taskGroupId": f"decisionTaskGroup-{revision5}"}
+            return {"coverageIngestionTaskGroupId": f"decisionTaskGroup-{revision5}"}
         elif get_task_details_calls == 1:
             assert decision_task_id == f"decisionTask-{revision4}"
             get_task_details_calls += 1
-            return {"taskGroupId": f"decisionTaskGroup-{revision4}"}
+            return {"coverageIngestionTaskGroupId": f"decisionTaskGroup-{revision4}"}
         elif get_task_details_calls == 2:
             assert decision_task_id == f"decisionTask-{revision2}"
             get_task_details_calls += 1
-            return {"taskGroupId": f"decisionTaskGroup-{revision2}"}
+            return {"coverageIngestionTaskGroupId": f"decisionTaskGroup-{revision2}"}
 
     monkeypatch.setattr(taskcluster, "get_task_details", get_task_details)
 
@@ -286,7 +286,7 @@ def triggerHook(self, hook_group, hook_id, payload):
                 assert payload == {
                     "REPOSITORY": "https://hg.mozilla.org/mozilla-central",
                     "REVISION": revision4,
-                    "taskGroupId": "myGroupId",
+                    "coverageIngestionTaskGroupId": "myGroupId",
                     "taskName": f"covdir for {revision4}",
                 }
                 trigger_hook_calls += 1
@@ -312,7 +312,7 @@ def get_task_details(decision_task_id):
         nonlocal get_task_details_calls
         assert decision_task_id == f"decisionTask-{revision4}"
         get_task_details_calls += 1
-        return {"taskGroupId": f"decisionTaskGroup-{revision4}"}
+        return {"coverageIngestionTaskGroupId": f"decisionTaskGroup-{revision4}"}
 
     monkeypatch.setattr(taskcluster, "get_task_details", get_task_details)
 
diff --git a/bot/tools/covdir_gen.py b/bot/tools/covdir_gen.py
@@ -24,7 +24,7 @@ def trigger_task(app_channel, task_group_id, commit):
     payload = {
         "REPOSITORY": MC_REPO,
         "REVISION": commit["changeset"],
-        "taskGroupId": task_group_id,
+        "coverageIngestionTaskGroupId": task_group_id,
         "taskName": name,
     }
     hook_id = HOOK_ID.format(app_channel=app_channel)
diff --git a/bot/tools/restart_tasks.py b/bot/tools/restart_tasks.py
@@ -43,7 +43,7 @@ def trigger_task(task_group_id, repository, commit):
     payload = {
         "REPOSITORY": repository,
         "REVISION": commit,
-        "taskGroupId": task_group_id,
+        "coverageIngestionTaskGroupId": task_group_id,
         "taskName": name,
     }
     hook_id = HOOK_ID.format(app_channel=secrets[secrets.APP_CHANNEL])

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ def trigger_task(task_group_id: str, revision: str) -> None:`
`39`	`39`	`{`
`40`	`40`	`"REPOSITORY": config.MOZILLA_CENTRAL_REPOSITORY,`
`41`	`41`	`"REVISION": revision,`
`42`		`- "taskGroupId": task_group_id,`
	`42`	`+ "coverageIngestionTaskGroupId": task_group_id,`
`43`	`43`	`"taskName": "covdir for {}".format(revision),`
`44`	`44`	`},`
`45`	`45`	`)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`{`
`18`	`18`	`"firedBy": "triggerHook",`
`19`	`19`	`"taskId": "xxx",`
`20`		`- "payload": {"taskName": "Custom task name", "taskGroupId": "yyyy"},`
	`20`	`+ "payload": {"taskName": "Custom task name", "coverageTaskGroupId": "yyyy"},`
`21`	`21`	`},`
`22`	`22`	`),`
`23`	`23`	`# Cron trigger`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ def trigger_task(app_channel, task_group_id, commit):`
`24`	`24`	`payload = {`
`25`	`25`	`"REPOSITORY": MC_REPO,`
`26`	`26`	`"REVISION": commit["changeset"],`
`27`		`- "taskGroupId": task_group_id,`
	`27`	`+ "coverageIngestionTaskGroupId": task_group_id,`
`28`	`28`	`"taskName": name,`
`29`	`29`	`}`
`30`	`30`	`hook_id = HOOK_ID.format(app_channel=app_channel)`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ def trigger_task(task_group_id, repository, commit):`
`43`	`43`	`payload = {`
`44`	`44`	`"REPOSITORY": repository,`
`45`	`45`	`"REVISION": commit,`
`46`		`- "taskGroupId": task_group_id,`
	`46`	`+ "coverageIngestionTaskGroupId": task_group_id,`
`47`	`47`	`"taskName": name,`
`48`	`48`	`}`
`49`	`49`	`hook_id = HOOK_ID.format(app_channel=secrets[secrets.APP_CHANNEL])`