1 files changed, 56 insertions, 6 deletions
diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml
index 73301313d6..1e38416e1c 100644
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -1262,7 +1262,7 @@ linux64-asan-fuzzing-ccov/opt:
     fetches:
         toolchain:
             - linux64-clang
-            - linux64-rust
+            - linux64-rust-dev
             - linux64-rust-size
             - linux64-cbindgen
             - linux64-dump_syms
@@ -1756,8 +1756,7 @@ linux64-add-on-devel/opt:
             - sysroot-wasm32-wasi
 
 linux64-aarch64/opt:
-    description: "Linux64 aarch64 Opt"
-    use-pgo: linux64-shippable/opt
+    description: "Linux AArch64 (a.k.a. ARM64) Opt"
     index:
         product: firefox
         job-name: linux64-aarch64-opt
@@ -1766,7 +1765,6 @@ linux64-aarch64/opt:
     treeherder:
         platform: linux64-aarch64/opt
         symbol: B
-        tier: 2
     worker:
         max-run-time: 7200
     run:
@@ -1783,6 +1781,60 @@ linux64-aarch64/opt:
         secrets: true
         tooltool-downloads: public
     run-on-projects: ['integration']
+    use-sccache: true
+    fetches:
+        toolchain:
+            - linux64-clang
+            - linux64-rust
+            - linux64-rust-size
+            - linux64-cbindgen
+            - linux64-dump_syms
+            - linux64-sccache
+            - linux64-node
+            - linux64-pkgconf
+            - sysroot-aarch64-linux-gnu
+            - sysroot-x86_64-linux-gnu
+            - sysroot-wasm32-wasi
+
+linux-aarch64-shippable/opt:
+    description: "Linux AArch64 (a.k.a. ARM64) Shippable"
+    use-pgo: linux64-shippable/opt
+    index:
+        product: firefox
+        job-name: linux-aarch64-opt
+        type: shippable
+    attributes:
+        shippable: true
+        enable-full-crashsymbols: true
+        skip-verify-test-packaging: true
+    shipping-phase: build
+    shipping-product: firefox
+    treeherder:
+        platform: linux-aarch64-shippable/opt
+        symbol: Bpgo(B)
+    worker-type: b-linux-xlarge-gcp
+    worker:
+        max-run-time: 9000
+        env:
+            # bug 1690154 - enable full symbols on all branches, but only
+            # upload them on the official set. In conjunction with
+            # `enable-full-crashsymbols`.
+            MOZ_ENABLE_FULL_SYMBOLS: "1"
+    run:
+        using: mozharness
+        actions: [get-secrets, build]
+        config:
+            - builds/releng_base_firefox.py
+            - builds/releng_base_linux_64_builds.py
+            - taskcluster_nightly.py
+        extra-config:
+            extra_mozconfig_content:
+                - ac_add_options --target=aarch64
+                - unset MOZ_STDCXX_COMPAT
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        tooltool-downloads: public
+    run-on-projects: ['mozilla-central']
     fetches:
         toolchain:
             - linux64-clang
@@ -1795,5 +1847,3 @@ linux64-aarch64/opt:
             - sysroot-aarch64-linux-gnu
             - sysroot-x86_64-linux-gnu
             - sysroot-wasm32-wasi
-    optimization:
-        skip-unless-expanded: null