Bug 1972948: remove maxRunTime from scriptworker tasks a=RyanVM DONTBUILD

The only scriptworker that supports this is the mac-native notarization poller, which is no longer in use.

Original Revision: https://phabricator.services.mozilla.com/D254321

Differential Revision: https://phabricator.services.mozilla.com/D269600
This commit is contained in:
Ben Hearsum
2025-10-27 17:15:59 +00:00
committed by rvandermeulen@mozilla.com
parent 8e86cc330f
commit 3d1afc20a5
14 changed files with 0 additions and 22 deletions

View File

@@ -30,9 +30,6 @@ beetmover_push_to_release_description_schema = Schema(
Required("shipping-phase"): task_description_schema["shipping-phase"], Required("shipping-phase"): task_description_schema["shipping-phase"],
Required("shipping-product"): task_description_schema["shipping-product"], Required("shipping-product"): task_description_schema["shipping-product"],
Optional("extra"): task_description_schema["extra"], Optional("extra"): task_description_schema["extra"],
Optional("worker"): {
Optional("max-run-time"): int,
},
} }
) )
@@ -85,8 +82,6 @@ def make_beetmover_push_to_release_worker(config, jobs):
"implementation": "beetmover-push-to-release", "implementation": "beetmover-push-to-release",
"product": job["product"], "product": job["product"],
} }
if job.get("worker", {}).get("max-run-time"):
worker["max-run-time"] = job["worker"]["max-run-time"]
job["worker"] = worker job["worker"] = worker
del job["product"] del job["product"]

View File

@@ -129,7 +129,6 @@ def make_task_description(config, jobs):
"worker": { "worker": {
"implementation": "scriptworker-signing", "implementation": "scriptworker-signing",
"upstream-artifacts": upstream_artifacts, "upstream-artifacts": upstream_artifacts,
"max-run-time": 3600,
}, },
"dependencies": dependencies, "dependencies": dependencies,
"attributes": attributes, "attributes": attributes,

View File

@@ -72,7 +72,6 @@ def make_signing_description(config, jobs):
worker_type = "linux-signing" worker_type = "linux-signing"
worker = { worker = {
"implementation": "scriptworker-signing", "implementation": "scriptworker-signing",
"max-run-time": 3600,
} }
rev = attributes["openh264_rev"] rev = attributes["openh264_rev"]
upstream_artifact = { upstream_artifact = {

View File

@@ -88,7 +88,6 @@ def make_release_generate_checksums_signing_description(config, jobs):
"worker": { "worker": {
"implementation": "scriptworker-signing", "implementation": "scriptworker-signing",
"upstream-artifacts": upstream_artifacts, "upstream-artifacts": upstream_artifacts,
"max-run-time": 3600,
}, },
"scopes": [ "scopes": [
signing_cert_scope, signing_cert_scope,

View File

@@ -140,7 +140,6 @@ def make_repackage_signing_description(config, jobs):
"worker": { "worker": {
"implementation": "scriptworker-signing", "implementation": "scriptworker-signing",
"upstream-artifacts": upstream_artifacts, "upstream-artifacts": upstream_artifacts,
"max-run-time": 3600,
}, },
"scopes": scopes, "scopes": scopes,
"dependencies": dependencies, "dependencies": dependencies,

View File

@@ -152,7 +152,6 @@ def make_repackage_signing_description(config, jobs):
"worker": { "worker": {
"implementation": "scriptworker-signing", "implementation": "scriptworker-signing",
"upstream-artifacts": upstream_artifacts, "upstream-artifacts": upstream_artifacts,
"max-run-time": 3600,
}, },
"scopes": scopes, "scopes": scopes,
"dependencies": dependencies, "dependencies": dependencies,

View File

@@ -49,8 +49,6 @@ signing_description_schema = Schema(
Optional("shipping-phase"): task_description_schema["shipping-phase"], Optional("shipping-phase"): task_description_schema["shipping-phase"],
Optional("shipping-product"): task_description_schema["shipping-product"], Optional("shipping-product"): task_description_schema["shipping-product"],
Required("dependencies"): task_description_schema["dependencies"], Required("dependencies"): task_description_schema["dependencies"],
# Optional control for how long a task may run (aka maxRunTime)
Optional("max-run-time"): int,
Optional("extra"): {str: object}, Optional("extra"): {str: object},
# Max number of partner repacks per chunk # Max number of partner repacks per chunk
Optional("repacks-per-chunk"): int, Optional("repacks-per-chunk"): int,
@@ -182,7 +180,6 @@ def make_task_description(config, jobs):
"worker": { "worker": {
"implementation": "scriptworker-signing", "implementation": "scriptworker-signing",
"upstream-artifacts": job["upstream-artifacts"], "upstream-artifacts": job["upstream-artifacts"],
"max-run-time": job.get("max-run-time", 3600),
}, },
"scopes": [signing_cert_scope] + signing_format_scopes, "scopes": [signing_cert_scope] + signing_format_scopes,
"dependencies": job["dependencies"], "dependencies": job["dependencies"],

View File

@@ -86,7 +86,6 @@ def make_checksums_signing_description(config, jobs):
"worker": { "worker": {
"implementation": "scriptworker-signing", "implementation": "scriptworker-signing",
"upstream-artifacts": upstream_artifacts, "upstream-artifacts": upstream_artifacts,
"max-run-time": 3600,
}, },
"scopes": [ "scopes": [
signing_cert_scope, signing_cert_scope,

View File

@@ -952,7 +952,6 @@ def build_beetmover_payload(config, task, task_def):
release_properties = worker["release-properties"] release_properties = worker["release-properties"]
task_def["payload"] = { task_def["payload"] = {
"maxRunTime": worker["max-run-time"],
"releaseProperties": { "releaseProperties": {
"appName": release_properties["app-name"], "appName": release_properties["app-name"],
"appVersion": release_properties["app-version"], "appVersion": release_properties["app-version"],
@@ -986,7 +985,6 @@ def build_beetmover_push_to_release_payload(config, task, task_def):
partners = [f"{p}/{s}" for p, s, _ in get_partners_to_be_published(config)] partners = [f"{p}/{s}" for p, s, _ in get_partners_to_be_published(config)]
task_def["payload"] = { task_def["payload"] = {
"maxRunTime": worker["max-run-time"],
"product": worker["product"], "product": worker["product"],
"version": release_config["version"], "version": release_config["version"],
"build_number": release_config["build_number"], "build_number": release_config["build_number"],

View File

@@ -27,7 +27,6 @@ tasks:
symbol: TM(gd-n) symbol: TM(gd-n)
worker: worker:
implementation: scriptworker-signing implementation: scriptworker-signing
max-run-time: 3600
upstream-artifacts: upstream-artifacts:
- taskType: signing - taskType: signing
paths: paths:

View File

@@ -17,8 +17,6 @@ kind-dependencies:
task-defaults: task-defaults:
run-on-projects: [] run-on-projects: []
shipping-phase: push shipping-phase: push
worker:
max-run-time: 2700
tasks: tasks:
devedition-push-to-release: devedition-push-to-release:

View File

@@ -25,5 +25,4 @@ tasks:
copy-attributes: true copy-attributes: true
shipping-product: firefox shipping-product: firefox
shipping-phase: promote shipping-phase: promote
max-run-time: 1800
copy-repack-ids: true copy-repack-ids: true

View File

@@ -25,5 +25,4 @@ tasks:
copy-attributes: true copy-attributes: true
shipping-product: firefox shipping-product: firefox
shipping-phase: promote shipping-phase: promote
max-run-time: 1800
copy-repack-ids: true copy-repack-ids: true

View File

@@ -23,6 +23,5 @@ tasks:
from-deps: from-deps:
group-by: chunk-locales group-by: chunk-locales
copy-attributes: true copy-attributes: true
max-run-time: 1800
treeherder: treeherder:
symbol: BMN symbol: BMN