Bug 1882100 - ship geckoview as part of nightly-android. r=taskgraph-reviewers,bhearsum,releng-reviewers,gabriel

Remove ship-geckoview cron job and target-tasks method.

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

.cron.yml

@@ -103,18 +103,6 @@ jobs:
           - oak
       when: []  # hook only
 
-    - name: ship-geckoview
-      job:
-          type: decision-task
-          treeherder-symbol: ship_geckoview
-          target-tasks-method: ship_geckoview
-          include-push-tasks: true
-      run-on-projects:
-          - mozilla-central
-      when:
-          by-project:
-              mozilla-central: [{hour: 10, minute: 0}, {hour: 22, minute: 0}]
-
     - name: general-perf-testing
       job:
           type: decision-task

taskcluster/ci/beetmover-geckoview/kind.yml

@@ -54,7 +54,7 @@ jobs:
             by-project:
                 # Beetmoving geckoview makes it available to the official maven repo.
                 # That happens:
-                # 1. as part of the ship-geckoview graph on mozilla-central
+                # 1. as part of the nightly-android or nightly-all 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.

taskcluster/gecko_taskgraph/target_tasks.py

@@ -772,35 +772,6 @@ def target_tasks_kaios(full_task_graph, parameters, graph_config):
     return [l for l, t in full_task_graph.tasks.items() if filter(t)]
 
 
-@_target_task("ship_geckoview")
-def target_tasks_ship_geckoview(full_task_graph, parameters, graph_config):
-    """Select the set of tasks required to ship geckoview nightly. The
-    nightly build process involves a pipeline of builds and an upload to
-    maven.mozilla.org."""
-    index_path = (
-        f"{graph_config['trust-domain']}.v2.{parameters['project']}.revision."
-        f"{parameters['head_rev']}.taskgraph.decision-ship-geckoview"
-    )
-    if os.environ.get("MOZ_AUTOMATION") and retry(
-        index_exists,
-        args=(index_path,),
-        kwargs={
-            "reason": "to avoid triggering multiple nightlies off the same revision",
-        },
-    ):
-        return []
-
-    def filter(task):
-        # XXX Starting 69, we don't ship Fennec Nightly anymore. We just want geckoview to be
-        # uploaded
-        return task.attributes.get("shipping_product") == "fennec" and task.kind in (
-            "beetmover-geckoview",
-            "upload-symbols",
-        )
-
-    return [l for l, t in full_task_graph.tasks.items() if filter(t)]
-
-
 @_target_task("custom-car_perf_testing")
 def target_tasks_custom_car_perf_testing(full_task_graph, parameters, graph_config):
     """Select tasks required for running daily performance tests for custom chromium-as-release."""
@@ -1651,6 +1622,14 @@ def target_tasks_snap_upstream_tests(full_task_graph, parameters, graph_config):
 @_target_task("nightly-android")
 def target_tasks_nightly_android(full_task_graph, parameters, graph_config):
     def filter(task, parameters):
+        # geckoview
+        if task.attributes.get("shipping_product") == "fennec" and task.kind in (
+            "beetmover-geckoview",
+            "upload-symbols",
+        ):
+            return True
+
+        # fenix/focus/a-c
         build_type = task.attributes.get("build-type", "")
         return build_type in (
             "nightly",

taskcluster/test/params/update.sh

@@ -70,12 +70,12 @@ for f in $files; do
             task=gecko.v2.${repo}.latest.taskgraph.decision-${task}
             service=index
             ;;
-        desktop-nightly)
-            task=gecko.v2.${repo}.latest.taskgraph.decision-nightly-desktop
+        android-nightly)
+            task=gecko.v2.${repo}.latest.taskgraph.decision-nightly-android
             service=index
             ;;
-        ship-geckoview)
-            task=gecko.v2.${repo}.latest.taskgraph.decision-ship-geckoview
+        desktop-nightly)
+            task=gecko.v2.${repo}.latest.taskgraph.decision-nightly-desktop
             service=index
             ;;
         push*|promote*|ship*)