tor-browser

commit 658e41e5b6704218a75a8432c85da0267bfda995
parent 97f5d96228490045d297a2dcc580f79cba76603f
Author: Julien Cristau <jcristau@mozilla.com>
Date:   Wed, 22 Oct 2025 11:51:56 +0000

Bug 1995600 - stop setting default max-run-time for beetmover and signingscript tasks. r=releng-reviewers,taskgraph-reviewers,bhearsum DONTBUILD

The max-run-time is ignored by beetmover payload builders.
For signingscript, 10 minutes seems to be fine except for localized
notarization jobs, which started failing after scriptworker started
taking the payload's maxRunTime into account in v61.2.0.

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

Diffstat:
M
taskcluster/gecko_taskgraph/transforms/task.py
 | 
17
+++++------------

1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/taskcluster/gecko_taskgraph/transforms/task.py b/taskcluster/gecko_taskgraph/transforms/task.py
@@ -907,7 +907,7 @@ def build_iscript_payload(config, task, task_def):
     "beetmover",
     schema={
         # the maximum time to run, in seconds
-        Required("max-run-time"): int,
+        Optional("max-run-time"): int,
         # locale key, if this is a locale beetmover job
         Optional("locale"): str,
         Required("release-properties"): {
@@ -963,7 +963,7 @@ def build_beetmover_payload(config, task, task_def):
     "beetmover-push-to-release",
     schema={
         # the maximum time to run, in seconds
-        Required("max-run-time"): int,
+        Optional("max-run-time"): int,
         Required("product"): str,
     },
 )
@@ -983,7 +983,7 @@ def build_beetmover_push_to_release_payload(config, task, task_def):
 @payload_builder(
     "beetmover-import-from-gcs-to-artifact-registry",
     schema={
-        Required("max-run-time"): int,
+        Optional("max-run-time"): int,
         Required("gcs-sources"): [str],
         Required("product"): str,
     },
@@ -998,7 +998,7 @@ def build_import_from_gcs_to_artifact_registry_payload(config, task, task_def):
 @payload_builder(
     "beetmover-maven",
     schema={
-        Required("max-run-time"): int,
+        Optional("max-run-time"): int,
         Required("release-properties"): {
             "app-name": str,
             "app-version": str,
@@ -1773,14 +1773,7 @@ def set_defaults(config, tasks):
                     "Windows and Linux, not on {}".format(worker["os"])
                 )
             worker.setdefault("chain-of-trust", False)
-        elif worker["implementation"] in (
-            "beetmover",
-            "beetmover-push-to-release",
-            "beetmover-maven",
-            "beetmover-import-from-gcs-to-artifact-registry",
-            "iscript",
-            "scriptworker-signing",
-        ):
+        elif worker["implementation"] in ("iscript",):
             worker.setdefault("max-run-time", 600)
         elif worker["implementation"] == "push-apk":
             worker.setdefault("commit", False)