diff --git a/taskcluster/gecko_taskgraph/__init__.py b/taskcluster/gecko_taskgraph/__init__.py index 11566dba9502..a00fee3b4a86 100644 --- a/taskcluster/gecko_taskgraph/__init__.py +++ b/taskcluster/gecko_taskgraph/__init__.py @@ -38,8 +38,6 @@ schema.EXCEPTED_SCHEMA_IDENTIFIERS.extend( "test_name", "json_location", "video_location", - "profile_name", - "target_path", ] ) diff --git a/taskcluster/gecko_taskgraph/transforms/hardened_signing.py b/taskcluster/gecko_taskgraph/transforms/hardened_signing.py index a13b8f464f26..c8667c3d9181 100644 --- a/taskcluster/gecko_taskgraph/transforms/hardened_signing.py +++ b/taskcluster/gecko_taskgraph/transforms/hardened_signing.py @@ -13,12 +13,6 @@ from gecko_taskgraph.util.attributes import release_level transforms = TransformSequence() -PROVISIONING_PROFILE_FILENAMES = { - "firefox": "orgmozillafirefox.provisionprofile", - "devedition": "orgmozillafirefoxdeveloperedition.provisionprofile", - "nightly": "orgmozillanightly.provisionprofile", -} - @transforms.add def add_hardened_sign_config(config, jobs): @@ -59,36 +53,3 @@ def add_hardened_sign_config(config, jobs): job["worker"]["hardened-sign-config"] = evaluated job["worker"]["mac-behavior"] = "mac_sign_and_pkg_hardened" yield job - - -@transforms.add -def add_provisioning_profile_config(config, jobs): - for job in jobs: - dep_job = get_primary_dependency(config, job) - assert dep_job - if ( - # Ensure signing task - "signing" in config.kind - # Ensure macosx platform - and "macosx" in job["attributes"]["build_platform"] - # Ensure project is considered production - and release_level(config.params["project"]) == "production" - # Ensure build is shippable - and dep_job.attributes.get("shippable", False) - ): - # Note that the check order here is important, as mozilla-central can build devedition - if "devedition" in dep_job.attributes.get("build_platform", ""): - # Devedition - filename = PROVISIONING_PROFILE_FILENAMES["devedition"] - elif config.params["project"] == "mozilla-central": - # Nightly - filename = PROVISIONING_PROFILE_FILENAMES["nightly"] - else: - # Release, beta, esr and variants should all use default firefox app id - # For full list of projects, see RELEASE_PROJECTS in taskcluster/gecko_taskgraph/util/attributes.py - filename = PROVISIONING_PROFILE_FILENAMES["firefox"] - - job["worker"]["provisioning-profile-config"] = [ - {"profile_name": filename, "target_path": "/embedded.provisionprofile"}, - ] - yield job diff --git a/taskcluster/gecko_taskgraph/transforms/task.py b/taskcluster/gecko_taskgraph/transforms/task.py index c25c165a7f98..1536697f181b 100644 --- a/taskcluster/gecko_taskgraph/transforms/task.py +++ b/taskcluster/gecko_taskgraph/transforms/task.py @@ -845,12 +845,6 @@ def build_generic_worker_payload(config, task, task_def): ), Optional("entitlements-url"): str, Optional("requirements-plist-url"): str, - Optional("provisioning-profile-config"): [ - { - Required("profile_name"): str, - Required("target_path"): str, - } - ], Optional("hardened-sign-config"): [ { Optional("deep"): bool, @@ -876,7 +870,6 @@ def build_scriptworker_signing_payload(config, task, task_def): "entitlements-url", "requirements-plist-url", "hardened-sign-config", - "provisioning-profile-config", ): if worker.get(attribute): task_def["payload"][attribute] = worker[attribute]