diff --git a/taskcluster/gecko_taskgraph/transforms/beetmover_push_to_release.py b/taskcluster/gecko_taskgraph/transforms/beetmover_push_to_release.py index 9baa87f4e1c8..76be879e5068 100644 --- a/taskcluster/gecko_taskgraph/transforms/beetmover_push_to_release.py +++ b/taskcluster/gecko_taskgraph/transforms/beetmover_push_to_release.py @@ -30,9 +30,6 @@ beetmover_push_to_release_description_schema = Schema( Required("shipping-phase"): task_description_schema["shipping-phase"], Required("shipping-product"): task_description_schema["shipping-product"], 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", "product": job["product"], } - if job.get("worker", {}).get("max-run-time"): - worker["max-run-time"] = job["worker"]["max-run-time"] job["worker"] = worker del job["product"] diff --git a/taskcluster/gecko_taskgraph/transforms/mar_signing.py b/taskcluster/gecko_taskgraph/transforms/mar_signing.py index 5d29ac9198c3..a12484376305 100644 --- a/taskcluster/gecko_taskgraph/transforms/mar_signing.py +++ b/taskcluster/gecko_taskgraph/transforms/mar_signing.py @@ -129,7 +129,6 @@ def make_task_description(config, jobs): "worker": { "implementation": "scriptworker-signing", "upstream-artifacts": upstream_artifacts, - "max-run-time": 3600, }, "dependencies": dependencies, "attributes": attributes, diff --git a/taskcluster/gecko_taskgraph/transforms/openh264_signing.py b/taskcluster/gecko_taskgraph/transforms/openh264_signing.py index ca4177d5a781..b4f41ed04963 100644 --- a/taskcluster/gecko_taskgraph/transforms/openh264_signing.py +++ b/taskcluster/gecko_taskgraph/transforms/openh264_signing.py @@ -72,7 +72,6 @@ def make_signing_description(config, jobs): worker_type = "linux-signing" worker = { "implementation": "scriptworker-signing", - "max-run-time": 3600, } rev = attributes["openh264_rev"] upstream_artifact = { diff --git a/taskcluster/gecko_taskgraph/transforms/release_generate_checksums_signing.py b/taskcluster/gecko_taskgraph/transforms/release_generate_checksums_signing.py index 7fdd5ef38090..bc25c1e126ef 100644 --- a/taskcluster/gecko_taskgraph/transforms/release_generate_checksums_signing.py +++ b/taskcluster/gecko_taskgraph/transforms/release_generate_checksums_signing.py @@ -88,7 +88,6 @@ def make_release_generate_checksums_signing_description(config, jobs): "worker": { "implementation": "scriptworker-signing", "upstream-artifacts": upstream_artifacts, - "max-run-time": 3600, }, "scopes": [ signing_cert_scope, diff --git a/taskcluster/gecko_taskgraph/transforms/repackage_signing.py b/taskcluster/gecko_taskgraph/transforms/repackage_signing.py index 98302d7cffdd..8e4876b2d026 100644 --- a/taskcluster/gecko_taskgraph/transforms/repackage_signing.py +++ b/taskcluster/gecko_taskgraph/transforms/repackage_signing.py @@ -140,7 +140,6 @@ def make_repackage_signing_description(config, jobs): "worker": { "implementation": "scriptworker-signing", "upstream-artifacts": upstream_artifacts, - "max-run-time": 3600, }, "scopes": scopes, "dependencies": dependencies, diff --git a/taskcluster/gecko_taskgraph/transforms/repackage_signing_partner.py b/taskcluster/gecko_taskgraph/transforms/repackage_signing_partner.py index 20600eff7cd9..9ff1b9939fea 100644 --- a/taskcluster/gecko_taskgraph/transforms/repackage_signing_partner.py +++ b/taskcluster/gecko_taskgraph/transforms/repackage_signing_partner.py @@ -152,7 +152,6 @@ def make_repackage_signing_description(config, jobs): "worker": { "implementation": "scriptworker-signing", "upstream-artifacts": upstream_artifacts, - "max-run-time": 3600, }, "scopes": scopes, "dependencies": dependencies, diff --git a/taskcluster/gecko_taskgraph/transforms/signing.py b/taskcluster/gecko_taskgraph/transforms/signing.py index 4c2375752ca3..dbdcea434ebb 100644 --- a/taskcluster/gecko_taskgraph/transforms/signing.py +++ b/taskcluster/gecko_taskgraph/transforms/signing.py @@ -49,8 +49,6 @@ signing_description_schema = Schema( Optional("shipping-phase"): task_description_schema["shipping-phase"], Optional("shipping-product"): task_description_schema["shipping-product"], 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}, # Max number of partner repacks per chunk Optional("repacks-per-chunk"): int, @@ -182,7 +180,6 @@ def make_task_description(config, jobs): "worker": { "implementation": "scriptworker-signing", "upstream-artifacts": job["upstream-artifacts"], - "max-run-time": job.get("max-run-time", 3600), }, "scopes": [signing_cert_scope] + signing_format_scopes, "dependencies": job["dependencies"], diff --git a/taskcluster/gecko_taskgraph/transforms/source_checksums_signing.py b/taskcluster/gecko_taskgraph/transforms/source_checksums_signing.py index cc3a6d647091..72c63ef6962f 100644 --- a/taskcluster/gecko_taskgraph/transforms/source_checksums_signing.py +++ b/taskcluster/gecko_taskgraph/transforms/source_checksums_signing.py @@ -86,7 +86,6 @@ def make_checksums_signing_description(config, jobs): "worker": { "implementation": "scriptworker-signing", "upstream-artifacts": upstream_artifacts, - "max-run-time": 3600, }, "scopes": [ signing_cert_scope, diff --git a/taskcluster/gecko_taskgraph/transforms/task.py b/taskcluster/gecko_taskgraph/transforms/task.py index fd4a27e1b7d2..90275f176b92 100644 --- a/taskcluster/gecko_taskgraph/transforms/task.py +++ b/taskcluster/gecko_taskgraph/transforms/task.py @@ -952,7 +952,6 @@ def build_beetmover_payload(config, task, task_def): release_properties = worker["release-properties"] task_def["payload"] = { - "maxRunTime": worker["max-run-time"], "releaseProperties": { "appName": release_properties["app-name"], "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)] task_def["payload"] = { - "maxRunTime": worker["max-run-time"], "product": worker["product"], "version": release_config["version"], "build_number": release_config["build_number"], diff --git a/taskcluster/kinds/geckodriver-mac-notarization/kind.yml b/taskcluster/kinds/geckodriver-mac-notarization/kind.yml index 9d15add0727c..a490d2c7bfa2 100644 --- a/taskcluster/kinds/geckodriver-mac-notarization/kind.yml +++ b/taskcluster/kinds/geckodriver-mac-notarization/kind.yml @@ -27,7 +27,6 @@ tasks: symbol: TM(gd-n) worker: implementation: scriptworker-signing - max-run-time: 3600 upstream-artifacts: - taskType: signing paths: diff --git a/taskcluster/kinds/release-beetmover-push-to-release/kind.yml b/taskcluster/kinds/release-beetmover-push-to-release/kind.yml index 4227d2437dc6..6c21077bece9 100644 --- a/taskcluster/kinds/release-beetmover-push-to-release/kind.yml +++ b/taskcluster/kinds/release-beetmover-push-to-release/kind.yml @@ -17,8 +17,6 @@ kind-dependencies: task-defaults: run-on-projects: [] shipping-phase: push - worker: - max-run-time: 2700 tasks: devedition-push-to-release: diff --git a/taskcluster/kinds/release-eme-free-repack-mac-notarization/kind.yml b/taskcluster/kinds/release-eme-free-repack-mac-notarization/kind.yml index 460a6e2be229..87b336123e08 100644 --- a/taskcluster/kinds/release-eme-free-repack-mac-notarization/kind.yml +++ b/taskcluster/kinds/release-eme-free-repack-mac-notarization/kind.yml @@ -25,5 +25,4 @@ tasks: copy-attributes: true shipping-product: firefox shipping-phase: promote - max-run-time: 1800 copy-repack-ids: true diff --git a/taskcluster/kinds/release-partner-repack-mac-notarization/kind.yml b/taskcluster/kinds/release-partner-repack-mac-notarization/kind.yml index 89bfcc3cc599..9ba6bf812455 100644 --- a/taskcluster/kinds/release-partner-repack-mac-notarization/kind.yml +++ b/taskcluster/kinds/release-partner-repack-mac-notarization/kind.yml @@ -25,5 +25,4 @@ tasks: copy-attributes: true shipping-product: firefox shipping-phase: promote - max-run-time: 1800 copy-repack-ids: true diff --git a/taskcluster/kinds/shippable-l10n-mac-notarization/kind.yml b/taskcluster/kinds/shippable-l10n-mac-notarization/kind.yml index e945c0312add..83f237e0f911 100644 --- a/taskcluster/kinds/shippable-l10n-mac-notarization/kind.yml +++ b/taskcluster/kinds/shippable-l10n-mac-notarization/kind.yml @@ -23,6 +23,5 @@ tasks: from-deps: group-by: chunk-locales copy-attributes: true - max-run-time: 1800 treeherder: symbol: BMN