From 96845ae7e745d7d976a21b7b6689e551715ce516 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@mozilla.com>
Date: Wed, 9 Mar 2022 10:41:47 +0000
Subject: [PATCH] Bug 1758507 - run beetmover-geckoview in `promote` phase
 instead of `push` r=releng-reviewers,aki DONTBUILD

Differential Revision: https://phabricator.services.mozilla.com/D140547
---
 taskcluster/ci/beetmover-geckoview/kind.yml | 17 ++++++-----------
 taskcluster/gecko_taskgraph/target_tasks.py | 16 ++++++----------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/taskcluster/ci/beetmover-geckoview/kind.yml b/taskcluster/ci/beetmover-geckoview/kind.yml
index 35a5014e7a3e..063f35bc0164 100644
--- a/taskcluster/ci/beetmover-geckoview/kind.yml
+++ b/taskcluster/ci/beetmover-geckoview/kind.yml
@@ -45,21 +45,16 @@ job-template:
     shipping-phase:
         by-project:
             # Beetmoving geckoview makes it available to the official maven repo.
-            # As of December 2019, we have automated betas shipped without being
-            # blocked on QA, hence we can upload geckoview as part of the
-            # `push` phase of the release graphs.
-            # So we want beetmover to act only when the release is greenlit. That
-            # is to say:
-            # 1. (to be changed soon to be as part of the nightly graph) right after nightly builds on mozilla-central
-            # 2. as part of Firefox push graphs on both mozilla-beta and mozilla-release
-            # 3. as part of ship-rc graphs on Firefox RC
-            # 4. at every patch uplifted on the GECKOVIEW_XX_RELBRANCH on mozilla-release
+            # That happens:
+            # 1. as part of the ship-geckoview graph on mozilla-central
+            # 2. as part of Firefox promote graphs on both mozilla-beta and mozilla-release
+            # 3. at every patch uplifted on the GECKOVIEW_XX_RELBRANCH on mozilla-release
             # Reminder: There is no Android/geckoview build on ESR.
             #
-            # The logic of point 2 and 3 is handled in target_tasks directly because it's mixing and
+            # The logic of point 2 is handled in target_tasks directly because it's mixing and
             # matching 2 different shipping-products
             mozilla-release: build
-            default: push
+            default: promote
     bucket-scope:
         by-release-level:
             production: 'project:releng:beetmover:bucket:maven-production'
diff --git a/taskcluster/gecko_taskgraph/target_tasks.py b/taskcluster/gecko_taskgraph/target_tasks.py
index 2cb59e08cbe9..5c7cd8161991 100644
--- a/taskcluster/gecko_taskgraph/target_tasks.py
+++ b/taskcluster/gecko_taskgraph/target_tasks.py
@@ -566,6 +566,12 @@ def target_tasks_promote_desktop(full_task_graph, parameters, graph_config):
     mozilla_{beta,release} tasks, plus l10n, beetmover, balrog, etc."""
 
     def filter(task):
+        # Bug 1758507 - geckoview ships in the promote phase
+        if "mozilla-esr" not in parameters["project"] and is_geckoview(
+            task, parameters
+        ):
+            return True
+
         if task.attributes.get("shipping_product") != parameters["release_product"]:
             return False
 
@@ -607,12 +613,6 @@ def target_tasks_push_desktop(full_task_graph, parameters, graph_config):
         # Include promotion tasks; these will be optimized out
         if task.label in filtered_for_candidates:
             return True
-        # XXX: Bug 1612540 - include beetmover jobs for publishing geckoview, along
-        # with the regular Firefox (not Devedition!) releases so that they are at sync
-        if "mozilla-esr" not in parameters["project"] and is_geckoview(
-            task, parameters
-        ):
-            return True
 
         if (
             task.attributes.get("shipping_product") == parameters["release_product"]
@@ -651,10 +651,6 @@ def target_tasks_ship_desktop(full_task_graph, parameters, graph_config):
         if task.label in filtered_for_candidates:
             return True
 
-        # XXX: Bug 1619603 - geckoview also ships alongside Firefox RC
-        if is_geckoview(task, parameters) and is_rc:
-            return True
-
         if (
             task.attributes.get("shipping_product") != parameters["release_product"]
             or task.attributes.get("shipping_phase") != "ship"