FxCI: Add Windows Aarch64

Alexandre Lissy · Alexandre Lissy · commit fb9956fe0695 · 2025-12-18T06:59:13.000+01:00
diff --git a/browser/config/mozconfigs/win64-aarch64/nightly-enterprise b/browser/config/mozconfigs/win64-aarch64/nightly-enterprise
@@ -0,0 +1,7 @@
+. "$topsrcdir/build/mozconfig.win-common"
+. "$topsrcdir/browser/config/mozconfigs/win64-aarch64/common-win64"
+. "$topsrcdir/browser/config/mozconfigs/win64-aarch64/common-opt"
+
+ac_add_options --enable-enterprise
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/python/mozbuild/mozbuild/repackaging/msix.py b/python/mozbuild/mozbuild/repackaging/msix.py
@@ -358,6 +358,7 @@ def repackage_msix(
         "aurora",
         "nightly",
         "unofficial",
+        "firefoxenterprise",
     ):
         raise Exception(f"channel is unrecognized: {channel}")
 
diff --git a/taskcluster/config.yml b/taskcluster/config.yml
@@ -199,7 +199,9 @@ treeherder:
         'Rpk-Ent': 'Enterprise repacks'
         'Rpk': 'Classic repacks'
         'MSI-Ent': "MSI Enterprise repacks"
+        'MSIX-Ent': "MSIX Enterprise repacks"
         'MSIs-Ent': "MSI signed Enterprise repacks"
+        'MSIXs-Ent': "MSIX signed Enterprise repacks"
         'BMS-Ent': "Mac signing for Enterprise repacks"
         'BMN-Ent': "Mac notarization for Enterprise repacks"
 
diff --git a/taskcluster/gecko_taskgraph/decision.py b/taskcluster/gecko_taskgraph/decision.py
@@ -142,6 +142,17 @@
                     },
                 },
             },
+            "repackage-msix": {
+                "sample": {
+                    "gcpEU": {
+                        "locales": ["en-US"],
+                        "platforms": [
+                            "win64-enterprise-shippable",
+                            "win64-aarch64-enterprise-shippable",
+                        ],
+                    },
+                },
+            },
             "enterprise-repack-repackage": {
                 "sample": {
                     "gcpEU": {
@@ -151,6 +162,7 @@
                             "linux64-aarch64-enterprise-shippable",
                             "macosx64-enterprise-shippable",
                             "win64-enterprise-shippable",
+                            "win64-aarch64-enterprise-shippable",
                         ],
                     },
                 },
@@ -160,9 +172,7 @@
                     "gcpEU": {
                         "locales": ["en-US"],
                         "platforms": [
-                            "linux64-enterprise-shippable",
                             "macosx64-enterprise-shippable",
-                            "win64-enterprise-shippable",
                         ],
                     },
                 },
@@ -172,8 +182,6 @@
                     "gcpEU": {
                         "locales": ["en-US"],
                         "platforms": [
-                            "linux64-enterprise-shippable",
-                            "macosx64-enterprise-shippable",
                             "win64-enterprise-shippable",
                         ],
                     },
diff --git a/taskcluster/gecko_taskgraph/transforms/partner_repack.py b/taskcluster/gecko_taskgraph/transforms/partner_repack.py
@@ -120,7 +120,11 @@ def add_command_arguments(config, tasks):
                     task["attributes"]["build_platform"],
                 ),
             )
-        platform = task["attributes"]["build_platform"].partition("-shippable")[0]
+        platform = (
+            task["attributes"]["build_platform"]
+            .partition("-shippable")[0]
+            .partition("-enterprise")[0]
+        )
         task["run"]["options"] = [
             "version={}".format(release_config["version"]),
             "build-number={}".format(release_config["build_number"]),
diff --git a/taskcluster/gecko_taskgraph/transforms/repackage.py b/taskcluster/gecko_taskgraph/transforms/repackage.py
@@ -529,11 +529,17 @@ def make_job_description(config, jobs):
         if not dep_th_platform and "enterprise-repack-repackage" in dep_job.kind:
             build_platform = attributes.get("build_platform")
             if "linux64" in build_platform:
-                dep_th_platform = "linux64-enterprise/opt"
+                if "aarch64" in build_platform:
+                    dep_th_platform = "linux64-aarch64-enterprise/opt"
+                else:
+                    dep_th_platform = "linux64-enterprise/opt"
             elif "macosx64" in build_platform:
                 dep_th_platform = "osx-cross-enterprise/opt"
             elif "win64" in build_platform:
-                dep_th_platform = "windows2012-64-enterprise/opt"
+                if "aarch64" in build_platform:
+                    dep_th_platform = "windows2012-aarch64-enterprise/opt"
+                else:
+                    dep_th_platform = "windows2012-64-enterprise/opt"
             else:
                 raise ValueError(f"Unsupported {build_platform}")
 
@@ -567,10 +573,14 @@ def make_job_description(config, jobs):
         elif config.kind == "repackage-msix":
             assert not locale
 
-            # Like "MSIXs(Bs)".
-            treeherder["symbol"] = "MSIX({})".format(
-                dep_job.task.get("extra", {}).get("treeherder", {}).get("symbol", "B")
-            )
+            if "enterprise-repack" in dep_job.label:
+                repack_id = dep_job.task.get("extra").get("repack_id")
+                treeherder["symbol"] = f"MSIX-Ent({repack_id})"
+            else:
+                # Like "MSIXs(Bs)".
+                treeherder["symbol"] = "MSIX({})".format(
+                    dep_job.task.get("extra", {}).get("treeherder", {}).get("symbol", "B")
+                )
 
         elif config.kind == "repackage-shippable-l10n-msix":
             assert not locale
diff --git a/taskcluster/gecko_taskgraph/transforms/repackage_partner.py b/taskcluster/gecko_taskgraph/transforms/repackage_partner.py
@@ -243,11 +243,17 @@ def make_job_description(config, jobs):
                 .replace("shippable", "")
             )
             if "linux64" in platform:
-                th_platform = "linux64-enterprise/opt"
+                if "aarch64" in platform:
+                    th_platform = "linux64-aarch64-enterprise/opt"
+                else:
+                    th_platform = "linux64-enterprise/opt"
             elif "macosx64" in platform:
                 th_platform = "osx-cross-enterprise/opt"
             elif "win64" in platform:
-                th_platform = "windows2012-64-enterprise/opt"
+                if "aarch64" in platform:
+                    th_platform = "windows2012-aarch64-enterprise/opt"
+                else:
+                    th_platform = "windows2012-64-enterprise/opt"
             else:
                 raise ValueError(f"Unsupported {platform}")
 
diff --git a/taskcluster/gecko_taskgraph/transforms/repackage_signing.py b/taskcluster/gecko_taskgraph/transforms/repackage_signing.py
@@ -77,7 +77,18 @@ def make_repackage_signing_description(config, jobs):
                 dep_symbol = dep_job.task.get("extra").get("treeherder").get("symbol")
                 treeherder["symbol"] = f"MSIs-Ent({dep_symbol})"
             else:
-                treeherder["symbol"] = "MSIs({})".format(locale or "N")
+                treeherder["symbol"] = "MSIs({})".format(
+                    dep_job.task.get("extra", {}).get("treeherder", {}).get("symbol", "B")
+                )
+
+        if config.kind == "repackage-signing-msix":
+            if "enterprise-repack" in dep_job.label:
+                dep_symbol = dep_job.task.get("extra").get("treeherder").get("symbol")
+                treeherder["symbol"] = f"MSIXs-Ent({dep_symbol})"
+            else:
+                treeherder["symbol"] = "MSIXs({})".format(
+                    dep_job.task.get("extra", {}).get("treeherder", {}).get("symbol", "B")
+                )
 
         elif config.kind in (
             "repackage-signing-msix",
diff --git a/taskcluster/kinds/beetmover-geckoview/kind.yml b/taskcluster/kinds/beetmover-geckoview/kind.yml
@@ -31,6 +31,7 @@ not-for-build-platforms:
     - win64-shippable/opt
     - win64-enterprise-shippable/opt
     - win64-aarch64-shippable/opt
+    - win64-aarch64-enterprise-shippable/opt
     - win64-nightlyasrelease/opt
     - linux64-devedition/opt
     - linux64-aarch64-devedition/opt
diff --git a/taskcluster/kinds/build/windows.yml b/taskcluster/kinds/build/windows.yml
@@ -531,6 +531,61 @@ win64-enterprise-shippable/opt:
         fetch:
             - upx-3.95-win
 
+win64-aarch64-enterprise-shippable/opt:
+    description: "AArch64 Win64 Enterprise Shippable"
+    index:
+        product: firefox
+        job-name: win64-aarch64-enterprise-opt
+        type: shippable
+    attributes:
+        shippable: true
+        enable-full-crashsymbols: true
+    shipping-phase: build
+    shipping-product: firefox
+    treeherder:
+        platform: windows2012-aarch64-enterprise-shippable/opt
+        symbol: Bent
+        tier: 1
+    run-on-projects: ["enterprise-firefox"]
+    run-on-repo-type: ["git"]
+    worker-type: b-linux-docker-xlarge-amd
+    worker:
+        max-run-time: 10800
+        env:
+            PERFHERDER_EXTRA_OPTIONS: enterprise
+            MOZ_AUTOMATION_PACKAGE_TESTS: "1"
+    run:
+        actions: [get-secrets, build]
+        options: [append-env-variables-from-configs]
+        script: mozharness/scripts/fx_desktop_build.py
+        secrets: true
+        config:
+            - builds/releng_base_firefox.py
+            - builds/releng_base_linux_64_builds.py
+        extra-config:
+            stage_platform: win64-aarch64
+            mozconfig_platform: win64-aarch64
+            max_build_output_timeout: 3600
+    fetches:
+        toolchain:
+            - linux64-clang
+            - linux64-rust-cross
+            - linux64-rust-size
+            - linux64-nasm
+            - linux64-node
+            - linux64-cbindgen
+            - linux64-dump_syms
+            - linux64-wine
+            - linux64-winchecksec
+            - nsis
+            - sysroot-x86_64-linux-gnu
+            - sysroot-wasm32-wasi
+            - vs
+            - dxc-aarch64-pc-windows-msvc
+            - winappsdk-aarch64-pc-windows-msvc
+        fetch:
+            - upx-3.95-win
+
 win64-plain/opt:
     description: "Win64 Opt Plain"
     index:
diff --git a/taskcluster/kinds/enterprise-repack-repackage/kind.yml b/taskcluster/kinds/enterprise-repack-repackage/kind.yml
@@ -22,6 +22,7 @@ kind-dependencies:
 only-for-build-platforms:
     - macosx64-enterprise-shippable/opt
     - win64-enterprise-shippable/opt
+    - win64-aarch64-enterprise-shippable/opt
 
 tasks:
     enterprise-repack-repackage:
@@ -44,6 +45,10 @@ tasks:
                         - repackage/base.py
                         - repackage/win32_sfx_stub.py
                         - repackage/win64_partner.py
+                    win64-aarch64\b.*:
+                        - repackage/base.py
+                        - repackage/win64-aarch64_sfx_stub.py
+                        - repackage/win64_signed.py
                     linux64.*:
                         - repackage/base.py
         package-formats:
diff --git a/taskcluster/kinds/enterprise-repack/kind.yml b/taskcluster/kinds/enterprise-repack/kind.yml
@@ -53,6 +53,7 @@ only-for-build-platforms:
     - linux64-aarch64-enterprise-shippable/opt
     - macosx64-enterprise-shippable/opt
     - win64-enterprise-shippable/opt
+    - win64-aarch64-enterprise-shippable/opt
 
 tasks:
     linux64-enterprise-shippable:
@@ -91,3 +92,12 @@ tasks:
             build_platform: win64-enterprise-shippable
             build_type: opt
             artifact_prefix: public
+    win64-aarch64-enterprise-shippable:
+        treeherder:
+            symbol: Rpk-Ent
+            platform: windows2012-aarch64-enterprise/opt
+        attributes:
+            shippable: true
+            build_platform: win64-aarch64-enterprise-shippable
+            build_type: opt
+            artifact_prefix: public
diff --git a/taskcluster/kinds/repackage-msix/kind.yml b/taskcluster/kinds/repackage-msix/kind.yml
@@ -13,20 +13,20 @@ transforms:
 
 kind-dependencies:
     # We're going to generate tasks based on this.  We `depend` on and fetch the package from this.
+    - enterprise-repack-repackage
     - build-signing
     - toolchain
 
-task-defaults:
-    run-on-repo-type: [hg]
-
 only-for-build-platforms:
     - win32/opt
     - win64/opt
     - win64-aarch64/opt
     - win64/debug
     - win32-shippable/opt
     - win64-shippable/opt
+    - win64-enterprise-shippable/opt
     - win64-aarch64-shippable/opt
+    - win64-aarch64-enterprise-shippable/opt
     - win32-devedition/opt
     - win64-devedition/opt
     - win64-aarch-devedition/opt
@@ -39,7 +39,7 @@ tasks:
         worker:
             max-run-time: 2700
         # This is for fast try iteration; `repackage-shippable-l10n-msix` is the "real one".
-        run-on-projects: []
+        # run-on-projects: []
         mozharness:
             config:
                 by-build-platform:
@@ -66,6 +66,7 @@ tasks:
                     devedition: aurora
                     default:
                         by-release-type:
+                            nightly-enterprise: FirefoxEnterprise
                             beta.*: beta
                             release.*: official
                             esr.*: official
@@ -80,12 +81,14 @@ tasks:
                         by-package-format:
                             msix:
                                 by-release-type:
+                                    nightly-enterprise: FirefoxEnterprise
                                     beta.*: MozillaFirefoxBeta
                                     release.*: MozillaFirefox
                                     esr.*: MozillaFirefox
                                     default: MozillaFirefoxNightly
                             msix-store:
                                 by-release-type:
+                                    nightly-enterprise: FirefoxEnterprise
                                     beta.*: FirefoxBeta
                                     release.*: Firefox
                                     esr.*: Firefox
diff --git a/taskcluster/kinds/repackage-signing-msix/kind.yml b/taskcluster/kinds/repackage-signing-msix/kind.yml
@@ -13,9 +13,6 @@ transforms:
 kind-dependencies:
     - repackage-msix
 
-task-defaults:
-    run-on-repo-type: [hg]
-
 tasks:
     repackage-signing-msix:
         from-deps:
diff --git a/taskcluster/kinds/repackage-signing/kind.yml b/taskcluster/kinds/repackage-signing/kind.yml
@@ -23,6 +23,7 @@ only-for-build-platforms:
     - win64-aarch64-devedition/opt
     - win64-asan-reporter-shippable/opt
     - win64-enterprise-shippable/opt
+    - win64-aarch64-enterprise-shippable/opt
 
 tasks:
     repackage-signing:
diff --git a/taskcluster/kinds/repackage/kind.yml b/taskcluster/kinds/repackage/kind.yml
@@ -45,6 +45,7 @@ only-for-build-platforms:
     - win64/opt
     - win64-asan-reporter-shippable/opt
     - win64-enterprise-shippable/opt
+    - win64-aarch64-enterprise-shippable/opt
 
 tasks:
     repackage:
