Bug 1612540 - bake geckoview in the push phase of releases. r=jlorenzo

Bug 1612540 - bake geckoview in the push phase of releases. r=jlorenzo

Differential Revision: https://phabricator.services.mozilla.com/D62065

--HG--
extra : moz-landing-system : lando

.cron.yml

@@ -92,13 +92,9 @@ jobs:
           include-push-tasks: true
       run-on-projects:
           - mozilla-central
-          - mozilla-beta
       when:
           by-project:
               mozilla-central: [{hour: 10, minute: 0}]
-              mozilla-beta:
-                  - {weekday: 'Monday', hour: 10, minute: 0}
-                  - {weekday: 'Thursday', hour: 10, minute: 0}
 
     - name: tp6m-fennec-v68
       job:

taskcluster/ci/beetmover-geckoview/kind.yml

@@ -50,14 +50,17 @@ 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:
-            # - right after nightly builds on mozilla-central
-            # - when Fennec beta was greenlit by QA on mozilla-beta (hence the ship phase)
+            # - (to be changed soon to be as part of the nightly graph) right after nightly builds on mozilla-central
+            # - as part of Firefox betas push graphs on mozilla-beta
             # - at every patch uplifted on the GECKOVIEW_XX_RELBRANC on mozilla-release
             # Reminder: There is no Android/geckoview build on ESR.
             mozilla-release: build
-            default: ship
+            default: push
     bucket-scope:
         by-release-level:
             production: 'project:releng:beetmover:bucket:maven-production'

taskcluster/taskgraph/target_tasks.py

@@ -299,6 +299,12 @@ def target_tasks_push_desktop(full_task_graph, parameters, graph_config):
         if task.attributes.get('shipping_product') == parameters['release_product'] and \
                 task.attributes.get('shipping_phase') == 'push':
             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 (task.attributes.get('shipping_product') == 'fennec' and
+            task.kind in ('beetmover-geckoview', 'upload-symbols') and
+                parameters['release_product'] == 'firefox'):
+            return True
 
     return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]