Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 11 insertions, 0 deletions

diff --git a/taskcluster/gecko_taskgraph/transforms/release_deps.py b/taskcluster/gecko_taskgraph/transforms/release_deps.py
index e44af576eb..aab8a2f60a 100644
--- a/taskcluster/gecko_taskgraph/transforms/release_deps.py
+++ b/taskcluster/gecko_taskgraph/transforms/release_deps.py
@@ -44,6 +44,17 @@ def add_dependencies(config, jobs):
                     != job["attributes"]["build_platform"]
                 ):
                     continue
+
+            # TODO get rid of the release-type match
+            if product == "firefox-android":
+                # exclude beta tasks from release graph and vice versa
+                from android_taskgraph.release_type import does_task_match_release_type
+
+                if not does_task_match_release_type(
+                    dep_task, config.params["release_type"]
+                ):
+                    continue
+
             # Add matching product tasks to deps
             if (
                 dep_task.task.get("shipping-product") == product