From af1c02eb33e0d75ab787def4dd494352695457ec Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@mozilla.com>
Date: Tue, 19 Mar 2024 17:02:43 +0000
Subject: [PATCH] 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                                   | 40 +++++++++++++--------
 taskcluster/gecko_taskgraph/target_tasks.py | 12 +++++++
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/.cron.yml b/.cron.yml
index e80b1979dcfe..5e8422d4c197 100644
--- a/.cron.yml
+++ b/.cron.yml
@@ -19,6 +19,19 @@ jobs:
                   - {weekday: 'Wednesday', hour: 13, minute: 0}
                   - {weekday: 'Friday', hour: 13, minute: 0}
 
+    - name: nightly-all
+      job:
+          type: decision-task
+          treeherder-symbol: N
+          target-tasks-method: nightly_all
+          include-push-tasks: true
+      run-on-projects:
+          - mozilla-central
+      when:
+          by-project:
+              mozilla-central: [{hour: 10, minute: 0}, {hour: 22, minute: 0}]
+              # No default
+
     - name: nightly-desktop
       job:
           type: decision-task
@@ -27,10 +40,7 @@ jobs:
           include-push-tasks: true
       run-on-projects:
           - mozilla-central
-      when:
-          by-project:
-              mozilla-central: [{hour: 10, minute: 0}, {hour: 22, minute: 0}]
-              # No default
+      when: []  # never (hook only)
 
     - name: nightly-desktop-linux
       job:
@@ -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
diff --git a/taskcluster/gecko_taskgraph/target_tasks.py b/taskcluster/gecko_taskgraph/target_tasks.py
index 67f97f92738e..855cbdafb268 100644
--- a/taskcluster/gecko_taskgraph/target_tasks.py
+++ b/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):