Revert "Bug 1812480 - Switch mac pkg source to repackaged instead of iscript r=releng-reviewers,taskgraph-reviewers,ahal" for causing Beetmover repackages build bustages

This reverts commit 454142c.

Revert "Bug 1812480 - Change Mac pkgs contents mode r=spohl,releng-reviewers,bhearsum"

This reverts commit 1a92842.

Author: rperta

python/mozbuild/mozpack/pkg.py

@@ -19,13 +19,6 @@
 PBZX_CHUNK_SIZE = 16 * 1024 * 1024  # 16MB chunks
 
 
-def chmod(dir):
-    "Set permissions of contents"
-    perms = "a+rX,a-st,ug+w,o-w"
-    print(f"Setting app permissions to: {perms}")
-    subprocess.check_call(["chmod", "-R", perms, dir])
-
-
 def get_apple_template(name: str) -> Template:
     """
     Given <name>, open file at <TEMPLATE_DIRECTORY>/<name>, read contents and
@@ -294,8 +287,6 @@ def create_pkg(
         distribution = distribution_tmp.substitute(app_info)
         save_text_file(distribution, flat_path / "Distribution")
 
-        chmod(root_path)
-
         payload_path = flat_path / f"{app_name}.pkg/Payload"
         create_payload(payload_path, root_path, cpio_tool)
 

taskcluster/config.yml

@@ -104,7 +104,6 @@ treeherder:
         'L10n': 'Localised Repacks'
         'L10n-Rpk': 'Localized Repackaged Repacks'
         'deb-L10n': 'Localized Debian Repacks'
-        'pkg-Rpk': 'MacOS pkg repackage'
         'BM': 'Beetmover'
         'BMR': 'Beetmover repackages'
         'BM-apt': 'Beetmover .deb packages'

taskcluster/docs/kinds.rst

@@ -615,22 +615,6 @@ repackage-rpm-signing
 ---------------------
 Repackage-rpm-signing takes the repackaged RPMs and signs them.
 
-repackage-pkg-signing
----------------------
-Repackage-pkg-signing takes the repackaged macOS .pkg installers and signs them.
-
-repackage-pkg-notarization
---------------------------
-Notarization of signed macOS .pkg installers via Apple's notarization service.
-
-repackage-l10n-pkg-signing
---------------------------
-Repackage-l10n-pkg-signing takes the l10n repackaged macOS .pkg installers and signs them.
-
-repackage-l10n-pkg-notarization
--------------------------------
-Notarization of signed macOS .pkg installers via Apple's notarization service.
-
 repackage-flatpak
 -----------------
 These repackage tasks take signed Firefox Linux binaries and langpacks, and builds a flatpak.

taskcluster/gecko_taskgraph/manifests/firefox_candidates.yml

@@ -58,8 +58,6 @@ tasktype_map:
     repackage-signing: repackage
     repackage-signing-msi: repackage
     repackage-signing-shippable-l10n-msix: signing
-    repackage-pkg-notarization: signing
-    repackage-l10n-pkg-notarization: signing
     langpack-copy: scriptworker
     attribution: build
     attribution-l10n: build
@@ -274,13 +272,7 @@ mapping:
         description: "Main package installer for Mac OS X platforms"
         all_locales: true
         from:
-            by-level:
-                "3":
-                    - repackage-pkg-notarization
-                    - repackage-l10n-pkg-notarization
-                default:
-                    - repackage
-                    - repackage-l10n
+            - signing
         only_for_platforms:
             - macosx64-shippable
         pretty_name: Firefox ${version}.pkg

taskcluster/gecko_taskgraph/manifests/firefox_nightly.yml

@@ -53,8 +53,6 @@ tasktype_map:
     repackage-signing: repackage
     repackage-signing-msi: repackage
     repackage-signing-shippable-l10n-msix: signing
-    repackage-pkg-notarization: signing
-    repackage-l10n-pkg-notarization: signing
     langpack-copy: signing
     attribution: build
     attribution-l10n: build
@@ -287,13 +285,7 @@ mapping:
         description: "Main package installer for Mac OS X platforms"
         all_locales: true
         from:
-            by-level:
-                "3":
-                    - repackage-pkg-notarization
-                    - repackage-l10n-pkg-notarization
-                default:
-                    - repackage
-                    - repackage-l10n
+            - signing
         only_for_platforms:
             - macosx64-shippable
         pretty_name: firefox-${version}.${locale}.${filename_platform}.pkg

taskcluster/gecko_taskgraph/transforms/beetmover_repackage.py

@@ -147,26 +147,25 @@ def make_task_description(config, jobs):
             "build": upstream_deps[build_name],
             "signing": upstream_deps[signing_name],
         }
-        # Optional dependencies: (dep_key, upstream_name) pairs.
-        # When the dep_key differs from the upstream name, the dependency is
-        # aliased (e.g. repackage_name -> "repackage").
-        optional_deps = [
-            ("repackage", repackage_name),
-            ("mar-signing", mar_signing_name),
-            ("partials-signing", "partials-signing"),
-            (msi_signing_name, msi_signing_name),
-            (msix_signing_name, msix_signing_name),
-            ("repackage-signing", repackage_signing_name),
-            (attribution_name, attribution_name),
-            (repackage_deb_name, repackage_deb_name),
-            ("repackage-pkg-notarization", "repackage-pkg-notarization"),
-            ("repackage-l10n-pkg-notarization", "repackage-l10n-pkg-notarization"),
-            ("upload-symbols", "upload-symbols"),
-            ("upload-symbols-dummy", "upload-symbols-dummy"),
-        ]
-        for dep_key, upstream_name in optional_deps:
-            if upstream_name in upstream_deps:
-                dependencies[dep_key] = upstream_deps[upstream_name]
+        if repackage_name in upstream_deps:
+            dependencies["repackage"] = upstream_deps[repackage_name]
+        if mar_signing_name in upstream_deps:
+            dependencies["mar-signing"] = upstream_deps[mar_signing_name]
+        if "partials-signing" in upstream_deps:
+            dependencies["partials-signing"] = upstream_deps["partials-signing"]
+        if msi_signing_name in upstream_deps:
+            dependencies[msi_signing_name] = upstream_deps[msi_signing_name]
+        if msix_signing_name in upstream_deps:
+            dependencies[msix_signing_name] = upstream_deps[msix_signing_name]
+        if repackage_signing_name in upstream_deps:
+            dependencies["repackage-signing"] = upstream_deps[repackage_signing_name]
+        if attribution_name in upstream_deps:
+            dependencies[attribution_name] = upstream_deps[attribution_name]
+        if repackage_deb_name in upstream_deps:
+            dependencies[repackage_deb_name] = upstream_deps[repackage_deb_name]
+        for kind in ("upload-symbols", "upload-symbols-dummy"):
+            if kind in upstream_deps:
+                dependencies[kind] = upstream_deps[kind]
 
         attributes = copy_attributes_from_dependent_job(dep_job)
         attributes.update(job.get("attributes", {}))

taskcluster/gecko_taskgraph/transforms/repackage_pkg_notarization.py

@@ -197,8 +197,8 @@ def make_task_description(config, jobs):
         if dep_job.kind in task["dependencies"]:
             task["if-dependencies"] = [dep_job.kind]
 
-        # Mac notarization uses signingscript instead of iscript
-        if "macosx" in build_platform and config.kind.endswith("-notarization"):
+        # build-mac-{signing,notarization} uses signingscript instead of iscript
+        if "macosx" in build_platform and config.kind.endswith("-mac-notarization"):
             task["worker"]["signing-type"] = "release-apple-notarization"
             task["scopes"] = [
                 add_scope_prefix(config, "signing:cert:release-apple-notarization")

taskcluster/gecko_taskgraph/transforms/repackage_pkg_signing.py

@@ -938,7 +938,6 @@ class IscriptSchema(Schema, forbid_unknown_fields=False, kw_only=True):
             "apple_notarization",
             "apple_notarization_stacked",
             "mac_sign_and_pkg",
-            "mac_sign_pkg",
             "mac_sign_and_pkg_hardened",
             "mac_geckodriver",
             "mac_notarize_geckodriver",