Bug 1889223 - Switch notarization behavior to apple_notarization_stacked r=releng-reviewers,taskgraph-reviewers,bhearsum

Differential Revision: https://phabricator.services.mozilla.com/D208808
This commit is contained in:
Heitor Neiva 2024-05-01 15:42:34 +00:00
Родитель 577412e4ee
Коммит 9cbf289920
4 изменённых файлов: 6 добавлений и 3 удалений

Просмотреть файл

@ -77,6 +77,7 @@ transforms.add_validate(signing_description_schema)
def add_requirements_link(config, jobs):
for job in jobs:
dep_job = get_primary_dependency(config, job)
assert dep_job
requirements_path = evaluate_keyed_by(
config.graph_config["mac-signing"]["mac-requirements"],
"mac requirements",
@ -95,6 +96,7 @@ def add_requirements_link(config, jobs):
def make_task_description(config, jobs):
for job in jobs:
dep_job = get_primary_dependency(config, job)
assert dep_job
attributes = dep_job.attributes
signing_format_scopes = []
@ -105,6 +107,7 @@ def make_task_description(config, jobs):
is_shippable = dep_job.attributes.get("shippable", False)
build_platform = dep_job.attributes.get("build_platform")
assert build_platform
treeherder = None
if "partner" not in config.kind and "eme-free" not in config.kind:
treeherder = job.get("treeherder", {})
@ -187,7 +190,6 @@ def make_task_description(config, jobs):
# build-mac-{signing,notarization} uses signingscript instead of iscript
if "macosx" in build_platform and config.kind.endswith("-mac-notarization"):
task["worker"]["mac-behavior"] = "apple_notarization"
task["scopes"] = [
add_scope_prefix(config, "signing:cert:release-apple-notarization")
]

Просмотреть файл

@ -842,6 +842,7 @@ def build_generic_worker_payload(config, task, task_def):
# behavior for mac iscript
Optional("mac-behavior"): Any(
"apple_notarization",
"apple_notarization_stacked",
"mac_sign_and_pkg",
"mac_sign_and_pkg_hardened",
"mac_geckodriver",

Просмотреть файл

@ -57,7 +57,7 @@ def generate_specifications_of_artifacts_to_sign(
elif "macosx" in build_platform:
langpack_formats = []
if is_notarization_kind(config.kind):
formats = ["apple_notarization"]
formats = ["apple_notarization_stacked"]
artifacts_specifications = [
{
"artifacts": [

Просмотреть файл

@ -29,6 +29,6 @@ jobs:
paths:
- public/build/target.tar.gz
- public/build/target.pkg
formats: ["apple_notarization"]
formats: ["apple_notarization_stacked"]
taskId:
task-reference: <build-mac-signing>