Bug 1882083 - combine desktop and android nightly hooks....

Bug 1882083 - combine desktop and android nightly hooks. r=RyanVM,releng-reviewers,taskgraph-reviewers,bhearsum DONTBUILD

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

.cron.yml

@@ -19,11 +19,11 @@ jobs:
                   - {weekday: 'Wednesday', hour: 13, minute: 0}
                   - {weekday: 'Friday', hour: 13, minute: 0}
 
-    - name: nightly-desktop
+    - name: nightly-all
       job:
           type: decision-task
-          treeherder-symbol: Nd
-          target-tasks-method: nightly_desktop
+          treeherder-symbol: N
+          target-tasks-method: nightly_all
           include-push-tasks: true
       run-on-projects:
           - mozilla-central
@@ -32,6 +32,16 @@ jobs:
               mozilla-central: [{hour: 10, minute: 0}, {hour: 22, minute: 0}]
               # No default
 
+    - name: nightly-desktop
+      job:
+          type: decision-task
+          treeherder-symbol: Nd
+          target-tasks-method: nightly_desktop
+          include-push-tasks: true
+      run-on-projects:
+          - mozilla-central
+      when: []  # never (hook only)
+
     - name: nightly-desktop-linux
       job:
           type: decision-task
@@ -82,6 +92,17 @@ jobs:
           - mozilla-central
       when: []  # never (hook only)
 
+    - name: nightly-android
+      job:
+          type: decision-task
+          treeherder-symbol: Na
+          target-tasks-method: nightly-android
+          include-push-tasks: true
+      run-on-projects:
+          - mozilla-central
+          - oak
+      when: []  # hook only
+
     - name: ship-geckoview
       job:
           type: decision-task
@@ -389,17 +410,6 @@ jobs:
       when:
           - {hour: 0, minute: 0}
 
-    - name: nightly-android
-      job:
-          type: decision-task
-          treeherder-symbol: Na
-          target-tasks-method: nightly-android
-          include-push-tasks: true
-      run-on-projects:
-          - mozilla-central
-          - oak
-      when: []  # hook only
-
     - name: android-l10n-import
       job:
           type: decision-task

taskcluster/gecko_taskgraph/target_tasks.py

@@ -1079,6 +1079,18 @@ def target_tasks_nightly_desktop(full_task_graph, parameters, graph_config):
     )
 
 
+@_target_task("nightly_all")
+def target_tasks_nightly_all(full_task_graph, parameters, graph_config):
+    from android_taskgraph.target_tasks import (
+        target_tasks_nightly as target_tasks_nightly_android,
+    )
+
+    return list(
+        set(target_tasks_nightly_desktop(full_task_graph, parameters, graph_config))
+        | set(target_tasks_nightly_android(full_task_graph, parameters, graph_config))
+    )
+
+
 # Run Searchfox analysis once daily.
 @_target_task("searchfox_index")
 def target_tasks_searchfox(full_task_graph, parameters, graph_config):