nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1876318 - android_taskgraph: update release-type and release promotion filters. r=gbrown,releng-reviewers

Browse source 
Ensure firefox-android release promotion picks up the right tasks.

Differential Revision: https://phabricator.services.mozilla.com/D201477
This commit is contained in:
Julien Cristau 2023-09-28 14:57:59 +02:00
parent ce1e8c7b9d
commit a0a6b8dc65
2 changed files with 8 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

9
taskcluster/android_taskgraph/release_type.py
View file

@ -4,8 +4,9 @@
def does_task_match_release_type(task, release_type): def does_task_match_release_type(task, release_type):
return ( if task.attributes.get("build-type", task.attributes.get("release-type")) is None:
# TODO: only use a single attribute to compare to `release_type` return True
task.attributes.get("build-type") == release_type return bool(
or task.attributes.get("release-type") == release_type {task.attributes.get("build-type"), task.attributes.get("release-type")}
& {release_type}
) )

10
taskcluster/android_taskgraph/target_tasks.py
View file

@ -101,19 +101,15 @@ def _filter_release_promotion(
return True return True
# TODO: get rid of this release_type match # TODO: get rid of this release_type match
if task.attributes.get(
"shipping_phase"
) == shipping_phase and does_task_match_release_type(
task, parameters["release_type"]
):
return True
if ( if (
task.attributes.get("shipping_phase") == shipping_phase task.attributes.get("shipping_phase") == shipping_phase
and task.attributes.get("shipping_product") == parameters["release_product"] and task.attributes.get("shipping_product") == parameters["release_product"]
and does_task_match_release_type(task, parameters["release_type"])
): ):
return True return True
return False
return [l for l, t in full_task_graph.tasks.items() if filter(t, parameters)] return [l for l, t in full_task_graph.tasks.items() if filter(t, parameters)]