Skip to content

Commit 0bb8929

Browse files
committed
report: Support cases where a push doesn't contain a Linux coverage build
1 parent 3078849 commit 0bb8929

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

report/firefox_code_coverage/codecoverage.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ def is_taskcluster_loaner():
3939

4040
def get_task(branch, revision):
4141
task = get_json(
42-
"https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.v2.%s.revision.%s.firefox.linux64-ccov-opt"
43-
% (branch, revision)
42+
f"https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.v2.{branch}.revision.{revision}.firefox.decision"
4443
)
4544
return task["taskId"]
4645

@@ -150,15 +149,19 @@ def get_task_status(task_id):
150149

151150

152151
def download_coverage_artifacts(
153-
build_task_id, suites, platforms, artifacts_path, suites_to_ignore=["talos", "awsy"]
152+
decision_task_id,
153+
suites,
154+
platforms,
155+
artifacts_path,
156+
suites_to_ignore=["talos", "awsy"],
154157
):
155158
try:
156159
os.mkdir(artifacts_path)
157160
except OSError as e:
158161
if e.errno != errno.EEXIST:
159162
raise e
160163

161-
task_data = get_task_details(build_task_id)
164+
task_data = get_task_details(decision_task_id)
162165

163166
# Returns True if the task is a test-related coverage task (build tasks are included).
164167
def _is_test_task(t):

report/tests/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def test(self):
3030
self.assertTrue(task_id)
3131

3232
task_data = codecoverage.get_task_details(task_id)
33-
self.assertEqual(task_data["metadata"]["name"], "build-linux64-ccov/opt")
33+
self.assertEqual(task_data["metadata"]["name"], "Gecko Decision Task")
3434

3535
revision = task_data["payload"]["env"]["GECKO_HEAD_REV"]
3636
task_id_2 = codecoverage.get_task("mozilla-central", revision)

0 commit comments

Comments
 (0)