Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

14 files changed, 409 insertions, 282 deletions

diff --git a/taskcluster/ci/test/awsy.yml b/taskcluster/ci/test/awsy.yml
index c3cafe7e9a..6ba85dcb82 100644
--- a/taskcluster/ci/test/awsy.yml
+++ b/taskcluster/ci/test/awsy.yml
@@ -5,7 +5,7 @@
 job-defaults:
     suite: awsy
     max-run-time: 7200
-    instance-size: xlarge
+    instance-size: xlarge-noscratch
     virtualization:
         by-test-platform:
             windows.*(?:-shippable)?-qr/.*: virtual-with-gpu
diff --git a/taskcluster/ci/test/browsertime-desktop.yml b/taskcluster/ci/test/browsertime-desktop.yml
index fab92c40a6..f4a1abe080 100644
--- a/taskcluster/ci/test/browsertime-desktop.yml
+++ b/taskcluster/ci/test/browsertime-desktop.yml
@@ -16,8 +16,6 @@ job-defaults:
         by-app:
             chrome:
                 - .*shippable.*
-            chromium:
-                - .*shippable.*
             safari:
                 - .*macos.*shippable.*
             custom-car:
@@ -84,8 +82,6 @@ browsertime-tp6:
             by-app:
                 chrome:
                     - .*shippable.*
-                chromium:
-                    - .*shippable.*
                 safari:
                     - .*macos.*shippable.*
                 custom-car:
@@ -103,11 +99,6 @@ browsertime-tp6:
                         - --browsertime-no-ffwindowrecorder
                         - --conditioned-profile=settled
                         - --extra-profiler-run
-                    macosx1015.*:
-                        - --chimera
-                        - --browsertime-no-ffwindowrecorder
-                        - --conditioned-profile=settled
-                        - --extra-profiler-run
                     default:
                         - --chimera
                         - --conditioned-profile=settled
@@ -184,11 +175,6 @@ browsertime-responsiveness:
                     - --browsertime-no-ffwindowrecorder
                     - --conditioned-profile=settled
                     - --extra-profiler-run
-                macosx1015.*:
-                    - --cold
-                    - --browsertime-no-ffwindowrecorder
-                    - --conditioned-profile=settled
-                    - --extra-profiler-run
                 default:
                     - --cold
                     - --conditioned-profile=settled
@@ -218,11 +204,6 @@ browsertime-tp6-essential:
                         - --conditioned-profile=settled
                         - --collect-perfstats
                         - --extra-profiler-run
-                    macosx1015.*:
-                        - --chimera
-                        - --browsertime-no-ffwindowrecorder
-                        - --conditioned-profile=settled
-                        - --extra-profiler-run
                     default:
                         - --chimera
                         - --conditioned-profile=settled
@@ -298,13 +279,6 @@ browsertime-tp6-bytecode:
                     - --conditioned-profile=settled
                     - --test-bytecode-cache
                     - --extra-profiler-run
-                macosx1015.*:
-                    - --chimera
-                    - --browsertime
-                    - --browsertime-no-ffwindowrecorder
-                    - --conditioned-profile=settled
-                    - --test-bytecode-cache
-                    - --extra-profiler-run
                 default:
                     - --chimera
                     - --browsertime
@@ -317,6 +291,51 @@ browsertime-tp6-bytecode:
             default: 3
     treeherder-symbol: Btime-cache(tp6)
 
+browsertime-tp7:
+    <<: &tp7-defaults
+        description: Raptor (browsertime) tp7 page-load tests
+        limit-platforms:
+            by-app:
+                chrome:
+                    - .*shippable.*
+                safari:
+                    - .*macos.*shippable.*
+                custom-car:
+                    - .*64.*shippable.*
+                default: []
+        max-run-time:
+            by-subtest:
+                imgur: 4800
+                default: 4000
+        mozharness:
+            extra-options:
+                by-test-platform:
+                    windows10-64.*shippable.*-qr.*:
+                        - --chimera
+                        - --browsertime-no-ffwindowrecorder
+                        - --conditioned-profile=settled
+                        - --extra-profiler-run
+                    default:
+                        - --chimera
+                        - --conditioned-profile=settled
+                        - --extra-profiler-run
+        run-on-projects: []
+        treeherder-symbol: Btime(tp7)
+    raptor:
+        apps: [firefox, chrome]
+        test: tp7
+        run-visual-metrics: true
+        subtests:
+            - tiktok
+            - openai
+            - samsung
+            - weather
+            - docomo
+    tier:
+        by-app:
+            firefox: 3
+            default: 3
+
 browsertime-benchmark:
     description: Raptor (browsertime) Benchmark tests
     raptor:
@@ -363,7 +382,7 @@ browsertime-benchmark:
                             # - [speedometer3, sp3] Perma fails on osx 10.15.x machines (Bug 1809535)
                             - [stylebench, sb]
                             - [sunspider, ss]
-                            - [unity-webgl, ugl]
+                            # - [unity-webgl, ugl] Almost Perma failing on osx 10.15.x machines (Bug 1888398)
                             - [webaudio, wa]
                         custom-car:
                             - [speedometer, sp]
@@ -901,11 +920,6 @@ browsertime-tp6-webextensions:
                     - --browsertime
                     - --browsertime-no-ffwindowrecorder
                     - --conditioned-profile=settled-webext
-                macosx1015.*:
-                    - --chimera
-                    - --browsertime-no-ffwindowrecorder
-                    - --conditioned-profile=settled
-                    - --extra-profiler-run
                 default:
                     - --chimera
                     - --browsertime
@@ -922,13 +936,11 @@ browsertime-indexeddb:
         by-app:
             chrome:
                 - .*shippable.*
-            chromium:
-                - .*shippable.*
             custom-car:
                 - .*64.*shippable.*
             default: []
     raptor:
-        apps: [firefox, chrome, chromium]
+        apps: [firefox, chrome]
         run-visual-metrics: false
         subtests:
             - addMab1
diff --git a/taskcluster/ci/test/browsertime-mobile.yml b/taskcluster/ci/test/browsertime-mobile.yml
index 8e685a590e..0ef0c0519e 100644
--- a/taskcluster/ci/test/browsertime-mobile.yml
+++ b/taskcluster/ci/test/browsertime-mobile.yml
@@ -15,11 +15,11 @@ job-defaults:
             fenix:
                 by-test-platform:
                     android-hw.*-aarch64.*/.*:
-                        index: mobile.v3.firefox-android.apks.fenix-nightly.latest.arm64-v8a
-                        name: build/target.arm64-v8a.apk
+                        upstream-task: signing-apk
+                        name: public/build/target.arm64-v8a.apk
                     default:
-                        index: mobile.v3.firefox-android.apks.fenix-nightly.latest.armeabi-v7a
-                        name: build/target.armeabi-v7a.apk
+                        upstream-task: signing-apk
+                        name: public/build/target.armeabi-v7a.apk
             refbrow:
                 by-test-platform:
                     android-hw.*-aarch64.*/.*:
@@ -69,6 +69,11 @@ job-defaults:
                 default:
                     - linux64-minidump-stackwalk
                     - linux64-fix-stacks
+    dependencies:
+        by-app:
+            fenix:
+                signing-apk: signing-apk-fenix-nightly-simulation
+            default: {}
 
 browsertime-tp6m:
     <<: &tp6m-defaults
@@ -92,6 +97,7 @@ browsertime-tp6m:
         tier:
             by-app:
                 geckoview: 1
+                fenix: 2
                 refbrow: 2
                 default: 3
         treeherder-symbol: Btime(tp6m)
@@ -142,6 +148,13 @@ browsertime-tp6m:
                                 by-test-platform:
                                     android-hw-a51.*shippable-qr.*: []
                                     default: []
+            fenix:
+                by-variant:
+                    geckoview-no-fission:
+                        by-test-platform:
+                            android-hw-a51.*shippable-qr.*: [trunk-only]
+                            default: []
+                    default: []
             default: []
 
 browsertime-tp6m-essential:
@@ -172,6 +185,10 @@ browsertime-tp6m-essential:
                         by-test-platform:
                             android-hw-a51.*shippable.*: [trunk-only]
                             default: []
+            fenix:
+                by-test-platform:
+                    android-hw-a51.*shippable.*: [trunk-only]
+                    default: []
             default: []
     tier:
         by-app:
@@ -216,13 +233,24 @@ browsertime-youtube-playback-mobile:
     raptor:
         apps: [fenix, geckoview, refbrow]
         subtests:
-            by-test-platform:
-                android-hw-a51.*:
-                    - [youtube-playback-h264-sfr, ytp-h264-sfr]
-                    - [youtube-playback-hfr, ytp-hfr]
-                    # Bug 1699469 - Disabled until a crash is fixed.
-                    # - [youtube-playback-widevine-h264-sfr, ytp-widevine-h264-sfr]
-                    # - [youtube-playback-widevine-hfr, ytp-widevine-hfr]
+            by-app:
+                fenix:
+                    by-test-platform:
+                        android-hw-a51.*:
+                            - [youtube-playback-av1-sfr, ytp-av1-sfr]
+                            - [youtube-playback-hfr, ytp-hfr]
+                            - [youtube-playback-vp9-sfr, ytp-vp9-sfr]
+                            # Bug 1699469 - Disabled until a crash is fixed.
+                            # - [youtube-playback-widevine-h264-sfr, ytp-widevine-h264-sfr]
+                            # - [youtube-playback-widevine-hfr, ytp-widevine-hfr]
+                default:
+                    by-test-platform:
+                        android-hw-a51.*:
+                            - [youtube-playback-h264-sfr, ytp-h264-sfr]
+                            - [youtube-playback-hfr, ytp-hfr]
+                            # Bug 1699469 - Disabled until a crash is fixed.
+                            # - [youtube-playback-widevine-h264-sfr, ytp-widevine-h264-sfr]
+                            # - [youtube-playback-widevine-hfr, ytp-widevine-hfr]
         test-url-param:
             by-subtest:
                 youtube-playback-h264-sfr:  # remove high resolution tests
@@ -244,6 +272,10 @@ browsertime-youtube-playback-mobile:
                 default: ""
     run-on-projects:
         by-app:
+            fenix:
+                by-test-platform:
+                    android-hw-a51.*shippable.*: [mozilla-central]
+                    default: []
             geckoview:
                 by-test-platform:
                     android-hw-a51.*shippable.*: [mozilla-central]
@@ -347,7 +379,10 @@ browsertime-benchmark-speedometer-mobile:
             default: 3
     run-on-projects:
         by-app:
-            refbrow: []
+            fenix:
+                by-test-platform:
+                    android-hw-a51.*shippable-qr.*: [trunk]
+                    default: []
             geckoview:
                 by-test-platform:
                     android-hw-a51.*shippable-qr.*: [trunk]
@@ -375,10 +410,17 @@ browsertime-benchmark-speedometer3-mobile:
             default: 3
     run-on-projects:
         by-app:
-            refbrow: []
+            fenix:
+                by-test-platform:
+                    android-hw-a51.*shippable-qr.*: [trunk-only]
+                    android-hw-p6.*shippable-qr.*: [mozilla-central]
+                    android-hw-s21.*shippable-qr.*: [mozilla-central]
+                    default: []
             geckoview:
                 by-test-platform:
                     android-hw-a51.*shippable-qr.*: [trunk-only]
+                    android-hw-p6.*shippable-qr.*: [mozilla-central]
+                    android-hw-s21.*shippable-qr.*: [mozilla-central]
                     default: []
             cstm-car-m: [mozilla-central]
             chrome-m:
diff --git a/taskcluster/ci/test/compiled.yml b/taskcluster/ci/test/compiled.yml
index 08434d5ac7..ebe6b9bb2b 100644
--- a/taskcluster/ci/test/compiled.yml
+++ b/taskcluster/ci/test/compiled.yml
@@ -49,7 +49,7 @@ gtest:
     description: "GTests run"
     suite: gtest
     treeherder-symbol: GTest
-    instance-size: xlarge
+    instance-size: xlarge-noscratch
     run-on-projects:
         by-variant:
             1proc:
@@ -81,17 +81,17 @@ jittest:
             default: []
     chunks:
         by-test-platform:
-            windows.*-ccov-qr/opt: 8
+            windows.*-ccov-qr/opt: 6
             windows.*: 1
             macosx.*/opt: 1
             macosx.*/debug: 3
-            android.*: 10
+            android.*/opt: 3
+            android-hw-.*-aarch64-qr/debug: 8
             default: 6
     max-run-time:
         by-test-platform:
-            windows.*-ccov.*/.*: 7200
-            macosx.*-ccov.*/.*: 7200
-            android-hw.*: 5400
+            windows.*-ccov.*/.*: 1800
+            android-hw.*: 2400
             default: 3600
     mozharness:
         chunked:
@@ -116,7 +116,10 @@ jittest-all:
         by-test-platform:
             android-hw-.*-arm7(?:-shippable)?-qr/.*: ['mozilla-central', 'release']
             default: []
-    chunks: 10
+    chunks:
+        by-test-platform:
+            android-.*/opt: 3
+            android-.*/debug: 6
     max-run-time: 3600
     mozharness:
         chunked: true
diff --git a/taskcluster/ci/test/kind.yml b/taskcluster/ci/test/kind.yml
index 514fb648c4..e9c2b1e5e9 100644
--- a/taskcluster/ci/test/kind.yml
+++ b/taskcluster/ci/test/kind.yml
@@ -7,6 +7,7 @@ loader: gecko_taskgraph.loader.test:loader
 kind-dependencies:
     - build
     - build-signing
+    - signing-apk
     - repackage-signing-shippable-l10n-msix
     - repackage-signing-msix
     - repackage-signing
@@ -45,6 +46,7 @@ jobs-from:
 job-defaults:
     attributes:
         retrigger: true
+    use-python: default
     require-signed-extensions:
         by-release-type:
             release|esr.*: true
@@ -83,6 +85,11 @@ job-defaults:
                     - android-emulator-linux
                     - linux64-minidump-stackwalk
                     - linux64-fix-stacks
+                    - linux64-hostutils
+                android-hw.*:
+                    - linux64-minidump-stackwalk
+                    - linux64-fix-stacks
+                    - linux64-hostutils
                 default:
                     - linux64-minidump-stackwalk
                     - linux64-fix-stacks
diff --git a/taskcluster/ci/test/misc.yml b/taskcluster/ci/test/misc.yml
index ba6fd7aec8..8f1f93157c 100644
--- a/taskcluster/ci/test/misc.yml
+++ b/taskcluster/ci/test/misc.yml
@@ -128,6 +128,7 @@ test-verify:
                     - linux64-node
                     - linux64-minidump-stackwalk
                     - linux64-fix-stacks
+                    - linux64-hostutils
 
 test-verify-gpu:
     description: "Extra verification of tests modified on this push on gpu instances"
@@ -229,6 +230,7 @@ test-coverage:
                     - linux64-node
                     - linux64-minidump-stackwalk
                     - linux64-fix-stacks
+                    - linux64-hostutils
 
 test-coverage-gpu:
     description: "Per-test coverage for tests that require gpu instances"
diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml
index afe9530364..1339652baf 100644
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -58,13 +58,11 @@ mochitest-plain:
         - xorigin
         - no-fission
         - socketprocess_networking
-        - webrender-sw+no-fission
-        - webrender-sw
         - headless
-        - headless+socketprocess_networking
         - http3
         - http2
         - geckoview-fission-isolate-high-value
+        - geckoview-no-fission-ship
     run-on-projects:
         by-variant:
             conditioned_profile:
@@ -86,17 +84,7 @@ mochitest-plain:
             socketprocess_networking:
                 by-test-platform:
                     .*(asan|ccov|wayland).*: []
-                    (linux.*64|macosx.*64|windows11-64.*)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
-                    default: []
-            webrender-sw+no-fission:
-                by-test-platform:
-                    android-em-7.0-x86_64-qr/debug: built-projects
-                    linux.*asan.*: ['trunk']
-                    linux.*64(-shippable)?-qr/(opt|debug): ['trunk']
-                    default: []
-            webrender-sw:
-                by-test-platform:
-                    linux1804-64-qr/debug: built-projects
+                    linux.*64.*(-shippable)?-qr/debug: ['autoland', 'mozilla-central']
                     default: []
             aab+no-fission:
                 by-test-platform:
@@ -107,17 +95,12 @@ mochitest-plain:
                     .*wayland.*: []
                     linux1804-64.*: ['mozilla-central']
                     default: []
-            headless+socketprocess_networking:
-                by-test-platform:
-                    .*wayland.*: []
-                    linux1804-64.*: ['mozilla-central']
-                    default: []
             no-fission:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug-isolated-process: []
                     android.*: built-projects
-                    linux1804-64-qr/debug: ['trunk']
-                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
+                    linux1804-64-qr/debug: ['mozilla-central']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['mozilla-central']
                     default: []
             http3:
                 by-test-platform:
@@ -132,6 +115,11 @@ mochitest-plain:
                     android-em-7.0-x86_64-qr/debug-isolated-process: []
                     android-em.*: built-projects
                     default: []
+            geckoview-no-fission-ship:
+                by-test-platform:
+                    android-em-7.0-x86_64-qr/debug-isolated-process: []
+                    android-em.*: built-projects
+                    default: []
             default:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug-isolated-process: []
@@ -146,9 +134,16 @@ mochitest-plain:
             linux.*/opt: 8
             windows.*/debug: 8
             default: 5
+    tier:
+        by-variant:
+            no-fission:
+                by-test-platform:
+                    linux.*64.*: 2
+                    default: default
+            default: default
     instance-size:
         by-test-platform:
-            linux.*64-tsan-qr/opt: xlarge  # runs out of memory using 8GB
+            linux.*64-tsan-qr/opt: xlarge-noscratch  # runs out of memory using 8GB
             default: default
     max-run-time: 3600
     allow-software-gl-layers: false
@@ -188,6 +183,7 @@ mochitest-plain:
                     - android-emulator-linux
                     - linux64-node
                     - linux64-minidump-stackwalk
+                    - linux64-hostutils
 
 mochitest-a11y:
     description: "Mochitest a11y run"
@@ -236,7 +232,6 @@ mochitest-browser-chrome:
                     linux.*64-shippable-qr/opt: ['release']
                     linux.*64(-shippable)?-qr/opt: built-projects
                     linux.*64-devedition-qr/opt: built-projects
-                    windows1.*-64.*-qr/debug: built-projects
                     .*wayland.*: []  # will change to built-projects when greened up
                     default: []
             webrender-sw+a11y-checks:
@@ -305,11 +300,9 @@ mochitest-browser-chrome:
     mozharness:
         mochitest-flavor: browser
         chunked: true
-    # Bug 1281241: migrating to m3.large instances
     instance-size:
         by-test-platform:
-            linux.*64-tsan-qr/opt: xlarge  # runs out of memory using 8GB
-            linux.*64-asan-qr/opt: xlarge  # runs out of memory using 8GB
+            linux.*64-asan-qr/opt: xlarge  # runs out of memory frequently
             default: default
     allow-software-gl-layers: false
 
@@ -444,7 +437,7 @@ mochitest-chrome:
                 by-test-platform:
                     .*asan.*: []
                     .*ccov.*: []
-                    (linux.*64|macosx.*64|windows11-64.*)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
+                    linux.*64.*(-shippable)?-qr/debug: ['autoland', 'mozilla-central']
                     default: []
             webrender-sw+1proc:
                 by-test-platform:
@@ -465,7 +458,7 @@ mochitest-chrome:
         chunked: true
     instance-size:
         by-test-platform:
-            linux.*64-tsan-qr/opt: xlarge  # runs out of memory otherwise using 8GB
+            linux.*64-tsan-qr/opt: xlarge-noscratch  # runs out of memory otherwise using 8GB
             default: default
 
 mochitest-devtools-chrome:
@@ -478,8 +471,6 @@ mochitest-devtools-chrome:
     variants:
         - a11y-checks
         - socketprocess_networking
-        - webrender-sw
-        - devtools-no-eft+no-fission
         - http3
     run-on-projects:
         by-variant:
@@ -487,10 +478,6 @@ mochitest-devtools-chrome:
                 by-test-platform:
                     linux.*64(-shippable)?-qr/opt: ['trunk']
                     default: []
-            devtools-no-eft+no-fission:
-                by-test-platform:
-                    linux.*64(-shippable)?-qr/opt: ['trunk']
-                    default: []
             http3:
                 by-test-platform:
                     linux1804-64-qr/debug: built-projects
@@ -499,12 +486,7 @@ mochitest-devtools-chrome:
                 by-test-platform:
                     .*asan.*: []
                     .*ccov.*: []
-                    (linux.*64|macosx.*64|windows.*)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
-                    default: []
-            webrender-sw:
-                by-test-platform:
-                    linux.*64-qr/debug: built-projects
-                    .*wayland.*: []  # will change to built-projects when greened up
+                    linux.*64.*(-shippable)?-qr/debug: ['autoland', 'mozilla-central']
                     default: []
             default:
                 by-test-platform:
@@ -534,7 +516,7 @@ mochitest-devtools-chrome:
         chunked: true
     instance-size:
         by-test-platform:
-            linux.*64-[at]san(-qr)?/opt: xlarge  # runs out of memory otherwise using 8GB
+            linux.*64-[at]san(-qr)?/opt: xlarge-noscratch  # runs out of memory otherwise using 8GB
             default: default
     # Bug 1296086: high number of intermittents observed with software GL and large instances
     allow-software-gl-layers: false
@@ -563,6 +545,7 @@ mochitest-devtools-chrome:
                     - android-emulator-linux
                     - linux64-node
                     - linux64-minidump-stackwalk
+                    - linux64-hostutils
 
 
 mochitest-devtools-chrome-failures:
@@ -615,8 +598,8 @@ mochitest-plain-gpu:
             webrender-sw+no-fission:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug: built-projects
-                    linux.*asan.*: ['trunk']
-                    linux.*64(-shippable)?-qr/(opt|debug): ['trunk']
+                    linux.*asan.*: ['mozilla-central']
+                    linux.*64(-shippable)?-qr/(opt|debug): ['mozilla-central']
                     default: []
             webrender-sw:
                 by-test-platform:
@@ -629,7 +612,7 @@ mochitest-plain-gpu:
                     linux1804-32.*: []
                     .*-tsan-qr/opt: []
                     .*wayland.*: []
-                    linux.*: ['trunk']  # linux opt/debug/asan
+                    linux.*: ['mozilla-central']  # linux opt/debug/asan
                     android.*: built-projects
                     default: []
             default:
@@ -638,9 +621,15 @@ mochitest-plain-gpu:
                     default: built-projects
     virtualization: virtual-with-gpu
     tier:
-        by-test-platform:
-            android-em-7.0-x86_64-qr/debug-isolated-process: 3
-            default: default
+        by-variant:
+            no-fission:
+                by-test-platform:
+                    linux.*64.*: 2
+                    default: default
+            default:
+                by-test-platform:
+                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
+                    default: default
     mozharness:
         mochitest-flavor: plain
         extra-options:
@@ -652,7 +641,7 @@ mochitest-plain-gpu:
                     - --mochitest-suite=mochitest-plain-gpu
     instance-size:
         by-test-platform:
-            linux.*64-tsan-qr/opt: xlarge  # runs out of memory otherwise using 8GB
+            linux.*64-tsan-qr/opt: xlarge-noscratch  # runs out of memory otherwise using 8GB
             default: default
 
 mochitest-chrome-gpu:
@@ -691,7 +680,7 @@ mochitest-chrome-gpu:
                     - --mochitest-suite=mochitest-chrome-gpu
     instance-size:
         by-test-platform:
-            linux.*64-tsan-qr/opt: xlarge  # runs out of memory using 8GB of memory
+            linux.*64-tsan-qr/opt: xlarge-noscratch  # runs out of memory using 8GB of memory
             default: default
 
 mochitest-media:
@@ -731,8 +720,8 @@ mochitest-media:
                     .*hw-ref.*: []
                     android-em-7.0-x86_64-qr/debug: ['autoland', 'mozilla-central']
                     android-hw-.*-aarch64-qr/debug: built-projects
-                    linux1804-64-qr/debug: ['trunk']
-                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
+                    linux1804-64-qr/debug: ['mozilla-central']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['mozilla-central']
                     default: []
             socketprocess:
                 by-test-platform:
@@ -749,8 +738,8 @@ mochitest-media:
                 by-test-platform:
                     .*hw-ref.*: []
                     android-em-7.0-x86_64-qr/debug: ['autoland', 'mozilla-central']
-                    linux1804-64-qr/debug: ['trunk']
-                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
+                    linux1804-64-qr/debug: ['mozilla-central']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['mozilla-central']
                     default: []
             webrender-sw:
                 by-test-platform:
@@ -765,8 +754,8 @@ mochitest-media:
                     android-hw-.*-arm7.*/(?:debug)?: ['trunk', 'mozilla-beta', 'mozilla-release']
                     android-em-7.0-x86_64-qr/debug-isolated-process: []
                     android.*: built-projects
-                    linux1804-64-qr/debug: ['trunk']
-                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
+                    linux1804-64-qr/debug: ['mozilla-central']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['mozilla-central']
                     default: []
             wmf-media-engine:
                 by-test-platform:
@@ -828,12 +817,26 @@ mochitest-media:
                     - --setpref=webgl.out-of-process=false
                     - --setpref=security.sandbox.content.headless=false
     tier:
-        by-test-platform:
-            .*ccov.*: 2
-            android-em.*: 1
-            android-em-7.0-x86_64-qr/debug-isolated-process: 3
-            android-hw.*: 1
-            default: default
+        by-variant:
+            no-fission:
+                by-test-platform:
+                    linux.*64.*: 2
+                    default: default
+            webrender-sw+no-fission:
+                by-test-platform:
+                    linux.*64.*: 2
+                    default: default
+            socketprocess+no-fission:
+                by-test-platform:
+                    linux.*64.*: 2
+                    default: default
+            default:
+                by-test-platform:
+                    .*ccov.*: 2
+                    android-em.*: 1
+                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
+                    android-hw.*: 1
+                    default: default
 
 mochitest-valgrind:
     description: "Mochitest plain Valgrind run"
@@ -1112,7 +1115,6 @@ mochitest-webgpu:
             default:
                 by-test-platform:
                     android.*: []
-                    macosx.*: []
                     # Things like asan/tsan/32bit are restricted to --full
                     # via UNCOMMON_TRY_TASK_LABELS
                     # in taskcluster/gecko_taskgraph/target_tasks.py.
@@ -1121,10 +1123,13 @@ mochitest-webgpu:
         by-test-platform:
             macosx.*64-ccov.*/.*: 7200
             default: 1800
-    # Bug 1296733: llvmpipe with mesa 9.2.1 lacks thread safety
-    allow-software-gl-layers: false
     mozharness:
         mochitest-flavor: plain
+        extra-options:
+            by-test-platform:
+                macos.*:
+                    - --setpref=gfx.webgpu.ignore-blocklist=true
+                default: []
 
 mochitest-remote:
     description: "Mochitest for the remote agent (/remote folder)"
@@ -1135,23 +1140,13 @@ mochitest-remote:
     variants:
         - no-fission
         - socketprocess_networking
-        - webrender-sw+no-fission
-        - webrender-sw
     run-on-projects:
         by-variant:
             socketprocess_networking:
                 by-test-platform:
                     .*asan.*: []
                     .*ccov.*: []
-                    (linux.*64|macosx.*64|windows1.*-64.*)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
-                    default: []
-            webrender-sw+no-fission:
-                by-test-platform:
-                    linux.*64-qr/debug: ['trunk']
-                    default: []
-            webrender-sw:
-                by-test-platform:
-                    linux.*64-qr/debug: ['all']
+                    linux.*64.*(-shippable)?-qr/debug: ['autoland', 'mozilla-central']
                     default: []
             no-fission:
                 by-test-platform:
diff --git a/taskcluster/ci/test/reftest.yml b/taskcluster/ci/test/reftest.yml
index 5e19ec3fd5..21474f7aad 100644
--- a/taskcluster/ci/test/reftest.yml
+++ b/taskcluster/ci/test/reftest.yml
@@ -41,7 +41,7 @@ crashtest:
     chunks:
         by-test-platform:
             android-em-7.*: 1
-            linux.*64-tsan-qr/opt: 32
+            linux.*64-tsan-qr/opt: 4
             default: 1
     variants:
         - no-fission
@@ -52,8 +52,8 @@ crashtest:
             webrender-sw+no-fission:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug: built-projects
-                    linux1804-64-qr/debug: ['trunk']
-                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
+                    linux1804-64-qr/debug: ['mozilla-central']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['mozilla-central']
                     default: []
             webrender-sw:
                 by-test-platform:
@@ -66,8 +66,8 @@ crashtest:
             no-fission:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug-isolated-process: []
-                    linux1804-64-qr/debug: ['trunk']
-                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
+                    linux1804-64-qr/debug: ['mozilla-central']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['mozilla-central']
                     android.*: built-projects
                     default: []
             default:
@@ -77,10 +77,20 @@ crashtest:
                     default: built-projects
     max-run-time: 3600
     tier:
-        by-test-platform:
-            android-hw-.*-qr/.*: 2
-            android-em-7.0-x86_64-qr/debug-isolated-process: 3
-            default: default
+        by-variant:
+            no-fission:
+                by-test-platform:
+                    linux.*: 2
+                    default: default
+            webrender-sw+no-fission:
+                by-test-platform:
+                    linux.*: 2
+                    default: default
+            default:
+                by-test-platform:
+                    android-hw-.*-qr/.*: 2
+                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
+                    default: default
 
 crashtest-qr:
     description: "Crashtest Webrender run"
@@ -127,8 +137,8 @@ jsreftest:
         by-variant:
             no-fission:
                 by-test-platform:
-                    linux1804-64-qr/debug: ['trunk']
-                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
+                    linux1804-64-qr/debug: ['mozilla-central']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['mozilla-central']
                     android-hw-.*-aarch64(?:-shippable)?-qr/.*: ['mozilla-central', 'release']
                     android-hw-.*-arm7(?:-shippable)?-qr/.*: ['mozilla-central', 'release']
                     android.*: built-projects
@@ -138,6 +148,13 @@ jsreftest:
                     android.*/.*: []
                     default: built-projects
     virtualization: virtual
+    tier:
+        by-variant:
+            no-fission:
+                by-test-platform:
+                    linux.*: 2
+                    default: default
+            default: default
 
 reftest:
     description: "Reftest run"
@@ -147,7 +164,7 @@ reftest:
         by-test-platform:
             android-em-7.*: 6
             linux1804-64(-shippable|-devedition|-qr)?/opt: 5
-            linux.*64-tsan-qr/opt: 32
+            linux.*64-tsan-qr/opt: 16
             macosx101.*-64-shippable(-qr)?/opt: 3
             macosx101.*-64/debug: 4
             macosx101.*-64(-ccov.*|-qr)/debug: 6
@@ -159,6 +176,7 @@ reftest:
             windows11.*/opt: 3
             default: 8
     variants:
+        - geckoview-no-fission-ship
         - no-fission
         - webrender-dcomp-disabled
         - webrender-dcomp-present
@@ -171,8 +189,8 @@ reftest:
             webrender-sw+no-fission:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug: built-projects
-                    linux1804-64-qr/debug: ['trunk']
-                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
+                    linux1804-64-qr/debug: ['mozilla-central']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['mozilla-central']
                     default: []
             webrender-sw:
                 by-test-platform:
@@ -184,10 +202,15 @@ reftest:
             no-fission:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug-isolated-process: []
-                    linux1804-64-qr/debug: ['trunk']
-                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
+                    linux1804-64-qr/debug: ['mozilla-central']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['mozilla-central']
                     android.*: built-projects
                     default: []
+            geckoview-no-fission-ship:
+                by-test-platform:
+                    android-em-7.0-x86_64-qr/debug-isolated-process: []
+                    android-em.*: built-projects
+                    default: []
             default:
                 by-test-platform:
                     android.*/.*: []
@@ -209,9 +232,19 @@ reftest:
                 windows.*/opt: false
                 default: true
     tier:
-        by-test-platform:
-            android-em-7.0-x86_64-qr/debug-isolated-process: 3
-            default: default
+        by-variant:
+            no-fission:
+                by-test-platform:
+                    linux.*: 2
+                    default: default
+            webrender-sw+no-fission:
+                by-test-platform:
+                    linux.*: 2
+                    default: default
+            default:
+                by-test-platform:
+                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
+                    default: default
 
 reftest-qr:
     description: "Reftest webrender run"
diff --git a/taskcluster/ci/test/talos.yml b/taskcluster/ci/test/talos.yml
index 28da3b47f4..3ce85fd039 100644
--- a/taskcluster/ci/test/talos.yml
+++ b/taskcluster/ci/test/talos.yml
@@ -694,7 +694,7 @@ talos-webgl:
     mozharness:
         extra-options:
             by-test-platform:
-                windows(10-64-ref-hw|11-64-2009-hw-ref).*:
+                windows11-64-2009-hw-ref.*:
                     - --suite=webgl
                     - --skip-preflight
                 default:
@@ -777,3 +777,41 @@ talos-realworld-webextensions-profiling:
         extra-options:
             - --suite=realworld-webextensions
             - --gecko-profile
+
+talos-pdfpaint:
+    description: Talos pdfpaint
+    try-name: pdfpaint
+    treeherder-symbol: T(pdfpaint)
+    variants:
+        - webrender-sw
+    run-on-projects:
+        by-variant:
+            webrender-sw:
+                by-test-platform:
+                    (linux1804|windows10|macosx1015)-64-shippable-qr.*: [trunk]
+                    default: []
+            default:
+                by-test-platform:
+                    windows.*-32-shippable.*/.*: []
+                    (linux|windows|macos)(?!.*shippable).*: []
+                    (linux|windows10-64|macos)(?!.*-qr).*: []
+                    default: [trunk]
+    max-run-time: 1800
+    mozharness:
+        extra-options:
+            - --suite=pdfpaint
+    fetches:
+        toolchain:
+            by-test-platform:
+                win.*:
+                    - win32-minidump-stackwalk
+                    - win32-fix-stacks
+                    - talos-pdfs
+                macosx1015.*:
+                    - macosx64-minidump-stackwalk
+                    - macosx64-fix-stacks
+                    - talos-pdfs
+                default:
+                    - linux64-minidump-stackwalk
+                    - linux64-fix-stacks
+                    - talos-pdfs
diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml
index 0f124e0878..b957b8a4db 100644
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -43,7 +43,6 @@ linux1804-64-qr/opt:
         - awsy
         - desktop-screenshot-capture
         - linux1804-tests
-        - mochitest-webgpu
         - web-platform-tests
         - web-platform-tests-backlog
         - talos
@@ -55,7 +54,6 @@ linux1804-64-shippable-qr/opt:
         - awsy
         - desktop-screenshot-capture
         - linux1804-tests
-        - mochitest-webgpu
         - web-platform-tests
         - web-platform-tests-backlog
         - talos
@@ -72,21 +70,18 @@ linux1804-64-qr/debug:
     build-platform: linux64/debug
     test-sets:
         - linux1804-tests
-        - mochitest-webgpu
         - web-platform-tests
 
 linux1804-64-asan-qr/opt:
     build-platform: linux64-asan/opt
     test-sets:
         - linux1804-tests
-        - mochitest-webgpu
         - web-platform-tests
 
 linux1804-64-tsan-qr/opt:
     build-platform: linux64-tsan/opt
     test-sets:
         - linux1804-tests
-        - mochitest-webgpu
         - web-platform-tests
 
 linux1804-64-ccov-qr/opt:
@@ -95,7 +90,6 @@ linux1804-64-ccov-qr/opt:
         - ccov-code-coverage-tests
         - linux1804-tests
         - linux1804-ccov-tests
-        - mochitest-webgpu
         - web-platform-tests
 
 linux1804-64-devedition-qr/opt:
@@ -116,18 +110,21 @@ linux2204-64-wayland/debug:
     test-sets:
         - linux2204-wayland-tests
         - web-platform-tests
+        - webgpu
 
 linux2204-64-wayland/opt:
     build-platform: linux64/opt
     test-sets:
         - linux2204-wayland-tests
         - web-platform-tests
+        - webgpu
 
 linux2204-64-wayland-shippable/opt:
     build-platform: linux64-shippable/opt
     test-sets:
         - linux2204-wayland-tests
         - web-platform-tests
+        - webgpu
 
 ##
 # Windows platforms (matching /windows.*/)
@@ -191,11 +188,6 @@ windows10-64-qr/opt:
         - windows-talos
         - browsertime
 
-windows10-64-ref-hw-2017-qr/opt:
-    build-platform: win64-shippable/opt
-    test-sets:
-        - talos-ref-hw
-
 windows11-64-2009-hw-ref-shippable/opt:
     build-platform: win64-shippable/opt
     build-signing-label:
@@ -274,6 +266,7 @@ windows11-64-2009-qr/debug:
             default: build-signing-win64/debug
     test-sets:
         - web-platform-tests
+        - webgpu
         - windows11-2009-tests
 
 windows11-64-2009-qr/opt:
@@ -287,6 +280,7 @@ windows11-64-2009-qr/opt:
         - desktop-screenshot-capture
         - web-platform-tests
         - web-platform-tests-backlog
+        - webgpu
         - windows11-2009-tests
         - talos-xperf
 
@@ -364,6 +358,7 @@ macosx1015-64-shippable-qr/opt:
         - talos-profiling
         - web-platform-tests
         - web-platform-tests-backlog
+        - webgpu
 
 macosx1015-64-nightlyasrelease-qr/opt:
     build-platform: macosx64-nightlyasrelease/opt
@@ -375,6 +370,7 @@ macosx1015-64-devedition-qr/opt:
     test-sets:
         - macosx1015-64-qr-tests
         - web-platform-tests
+        - webgpu
 
 macosx1015-64-qr/opt:
     build-platform: macosx64/opt
@@ -383,6 +379,7 @@ macosx1015-64-qr/opt:
         - macosx1015-64-qr-tests
         - web-platform-tests
         - web-platform-tests-backlog
+        - webgpu
         - browsertime
 
 macosx1015-64-qr/debug:
@@ -390,6 +387,7 @@ macosx1015-64-qr/debug:
     test-sets:
         - macosx1015-64-qr-tests
         - web-platform-tests
+        - webgpu
 
 macosx1015-64-ccov-qr/opt:
     build-platform: macosx64-ccov/opt
diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index 16807b5b9e..4a8f3d019b 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -15,6 +15,10 @@
 
 ### Feature-specific test groups
 
+webgpu:
+    - mochitest-webgpu
+    - web-platform-tests-webgpu
+
 web-platform-tests:
     - web-platform-tests
     - web-platform-tests-crashtest
@@ -22,7 +26,6 @@ web-platform-tests:
     - web-platform-tests-print-reftest
     - web-platform-tests-reftest
     - web-platform-tests-wdspec
-    - web-platform-tests-webgpu
     - web-platform-tests-canvas
 
 web-platform-tests-backlog:
@@ -32,9 +35,6 @@ web-platform-tests-backlog:
 mochitest-devtools-chrome:
     - mochitest-devtools-chrome
 
-mochitest-webgpu:
-    - mochitest-webgpu
-
 talos:
     - talos-bcv
     - talos-chrome
@@ -55,6 +55,7 @@ talos:
     - talos-tabswitch
     - talos-realworld-webextensions
     - talos-webgl
+    - talos-pdfpaint
     # - talos-h1 Bug 1487031 - Disabled for not finding actionable regressions
     # - talos-h2 Bug 1487031 - Disabled for not finding actionable regressions
 
@@ -83,6 +84,7 @@ talos-ref-hw:
 
 browsertime:
     - browsertime-tp6
+    - browsertime-tp7
     - browsertime-tp6-essential
     - browsertime-tp6-bytecode
     - browsertime-tp6-live
@@ -235,7 +237,6 @@ windows32-2009-tests:
     - mochitest-plain
     - mochitest-plain-gpu
     - mochitest-remote
-    - mochitest-webgpu
     - reftest
     - telemetry-tests-client
     - test-verify
@@ -279,7 +280,6 @@ windows11-2009-tests:
     - mochitest-plain
     - mochitest-plain-gpu
     - mochitest-remote
-    - mochitest-webgpu
     - mochitest-webgl1-core
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
@@ -301,7 +301,6 @@ mingwclang-tests-debug:
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
     - mochitest-webgl2-ext
-    - mochitest-webgpu
     - reftest
     - telemetry-tests-client
 
@@ -318,7 +317,6 @@ mingwclang-win32-tests-debug:
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
     - mochitest-webgl2-ext
-    - mochitest-webgpu
     # - reftest - disabled, see bug 1642719
     - telemetry-tests-client
 
@@ -346,6 +344,7 @@ windows-talos:
     - talos-tabswitch
     - talos-realworld-webextensions
     - talos-webgl
+    - talos-pdfpaint
     # - talos-h1 Bug 1487031 - Disabled for not finding actionable regressions
 
 windows-ref-hw-tests:
@@ -366,7 +365,6 @@ macosx1100-64-qr-tests:
     - mochitest-browser-media
     - mochitest-chrome-gpu
     - mochitest-media
-    - mochitest-webgpu
     - mochitest-webgl1-core
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
@@ -400,7 +398,6 @@ macosx1015-64-qr-tests:
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
     - mochitest-webgl2-ext
-    - mochitest-webgpu
     - reftest
     - telemetry-tests-client
     - test-verify
@@ -427,6 +424,7 @@ macosx64-talos:
     - talos-realworld-webextensions
     - talos-webgl
     - talos-tabswitch
+    - talos-pdfpaint
     # - talos-h1 # too long to unpack profile- Bug 1442893
 
 macosx1400-64-qr-tests:
diff --git a/taskcluster/ci/test/variants.yml b/taskcluster/ci/test/variants.yml
index c57a332a91..8cb31ee047 100644
--- a/taskcluster/ci/test/variants.yml
+++ b/taskcluster/ci/test/variants.yml
@@ -77,6 +77,7 @@ aab:
                 - linux64-minidump-stackwalk
                 - linux64-fix-stacks
                 - linux64-jdk
+                - linux64-hostutils
     replace:
         target: "geckoview-test_runner.aab"
 
@@ -297,7 +298,7 @@ webrender-dcomp-compositing:
 webrender-sw:
     description: "{description} with software webrender enabled"
     component: "Core::Graphics: WebRender"
-    expiration: "2024-09-01"
+    expiration: "never"
     suffix: "swr"
     mozinfo: "swgl"
     merge:
@@ -317,27 +318,6 @@ webgl-ipc:
                 - "--setpref=webgl.out-of-process=true"
                 - "--setpref=security.sandbox.content.headless=true"
 
-devtools-no-eft:
-    description: "{description} with DevTools EFT disabled"
-    component: "DevTools::Framework"
-    expiration: "2024-03-01"
-    suffix: "dt-no-eft"
-    when:
-        $eval: '
-                "linux" in task["test-platform"]
-                && "opt" in task["test-platform"]
-                && "mochitest-devtools-chrome" == task["try-name"]
-                && !(
-                        "asan" in task["test-platform"]
-                        || "tsan" in task["test-platform"]
-                        || "ccov" in task["test-platform"]
-                    )
-                '
-    merge:
-        mozharness:
-            extra-options:
-                - "--setpref=devtools.every-frame-target.enabled=false"
-
 wmf-media-engine:
     description: "{description} with Windows Media Foundation media engine enabled"
     component: "Core::Audio/Video: Playback"
diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml
index 4ef9721fe6..4a1818cbd6 100644
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -5,7 +5,7 @@
 job-defaults:
     suite:
         category: web-platform-tests
-    instance-size: xlarge
+    instance-size: xlarge-noscratch
     max-run-time:
         by-test-platform:
             android-em-7.0-x86_64/debug: 7200
@@ -37,9 +37,15 @@ web-platform-tests:
     treeherder-symbol: W(wpt)
     virtualization: virtual
     tier:
-        by-test-platform:
-            android-em-7.0-x86_64-qr/debug-isolated-process: 3
-            default: default
+        by-variant:
+            no-fission:
+                by-test-platform:
+                    linux.*: 2
+                    default: default
+            default:
+                by-test-platform:
+                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
+                    default: default
     chunks:
         by-test-platform:
             android.*/debug: 32
@@ -63,29 +69,14 @@ web-platform-tests:
             default: 7200
     variants:
         - no-fission
-        - webrender-sw+no-fission
-        - webrender-sw
     run-on-projects:
         by-variant:
-            webrender-sw:
-                by-test-platform:
-                    .*-32.*/.*: []
-                    linux.*64-qr/debug: built-projects
-                    windows.*-qr/debug: built-projects
-                    android-em-7.0-x86_64-qr/debug: []
-                    default: []
-            webrender-sw+no-fission:
-                by-test-platform:
-                    .*-32.*/.*: []
-                    android-em-7.0-x86_64-qr/debug: built-projects
-                    linux.*64-qr/debug: built-projects
-                    default: []
             no-fission:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug-isolated-process: []
                     android.*: built-projects
-                    linux1804-64-qr/debug: ['trunk']
-                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
+                    linux1804-64-qr/debug: ['mozilla-central']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['mozilla-central']
                     default: []
             default:
                 by-test-platform:
@@ -198,14 +189,14 @@ web-platform-tests-reftest:
             webrender-sw+no-fission:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug: built-projects
-                    linux1804-64-qr/debug: ['trunk']
-                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
+                    linux1804-64-qr/debug: ['mozilla-central']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['mozilla-central']
                     default: []
             no-fission:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug-isolated-process: []
-                    linux1804-64-qr/debug: ['trunk']
-                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
+                    linux1804-64-qr/debug: ['mozilla-central']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['mozilla-central']
                     android.*: built-projects
                     default: []
             default:
@@ -214,9 +205,15 @@ web-platform-tests-reftest:
                     .*wayland.*: []
                     default: built-projects
     tier:
-        by-test-platform:
-            android-em-7.0-x86_64-qr/debug-isolated-process: 3
-            default: default
+        by-variant:
+            no-fission:
+                by-test-platform:
+                    linux.*: 2
+                    default: default
+            default:
+                by-test-platform:
+                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
+                    default: default
     mozharness:
         extra-options:
             - --test-type=reftest
@@ -232,7 +229,6 @@ web-platform-tests-webgpu:
     virtualization: virtual-with-gpu
     tier:
         by-test-platform:
-            .*-32.*/.*: 3
             android.*: 3  # https://bugzilla.mozilla.org/show_bug.cgi?id=1849914
             macos.*: 3  # https://bugzilla.mozilla.org/show_bug.cgi?id=1849913
             linux2204.*-64.*: 3  # https://bugzilla.mozilla.org/show_bug.cgi?id=1849912
@@ -257,8 +253,7 @@ web-platform-tests-webgpu:
     variants: []  # We don't need sw or nofis testing.
     run-on-projects:
         by-test-platform:
-            android.*: []  # Out of scope
-            linux1804.*: []  # We don't support anything less than Mesa Lavapipe 22.1.2, so this is _out_.
+            android.*: []  # https://bugzilla.mozilla.org/show_bug.cgi?id=1836811
             .*-wayland/debug.*: []  # https://bugzilla.mozilla.org/show_bug.cgi?id=1864700
             default: ['mozilla-central']
     mozharness:
@@ -283,9 +278,15 @@ web-platform-tests-canvas:
     treeherder-symbol: W(canvas)
     virtualization: virtual-with-gpu
     tier:
-        by-test-platform:
-            android-em-7.0-x86_64-qr/debug-isolated-process: 3
-            default: default
+        by-variant:
+            no-fission:
+                by-test-platform:
+                    linux.*: 2
+                    default: default
+            default:
+                by-test-platform:
+                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
+                    default: default
     chunks:
         by-test-platform:
             windows.*: 2
@@ -299,29 +300,14 @@ web-platform-tests-canvas:
             default: 1800
     variants:
         - no-fission
-        - webrender-sw+no-fission
-        - webrender-sw
     run-on-projects:
         by-variant:
-            webrender-sw:
-                by-test-platform:
-                    .*-32.*/.*: []
-                    linux.*64-qr/debug: built-projects
-                    windows.*-qr/debug: built-projects
-                    android-em-7.0-x86_64-qr/debug: []
-                    default: []
-            webrender-sw+no-fission:
-                by-test-platform:
-                    .*-32.*/.*: []
-                    android-em-7.0-x86_64-qr/debug: built-projects
-                    linux.*64-qr/debug: built-projects
-                    default: []
             no-fission:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug-isolated-process: []
                     android.*: built-projects
-                    linux1804-64-qr/debug: ['trunk']
-                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
+                    linux1804-64-qr/debug: ['mozilla-central']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['mozilla-central']
                     default: []
             default:
                 by-test-platform:
@@ -391,24 +377,9 @@ web-platform-tests-wdspec:
                     - --test-type=wdspec
     variants:
         - no-fission
-        - webrender-sw+no-fission
-        - webrender-sw
         - headless
     run-on-projects:
         by-variant:
-            webrender-sw+no-fission:
-                by-test-platform:
-                    android-em-7.0-x86_64-qr/debug: built-projects
-                    linux1804-64-qr/debug: ['trunk']
-                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
-                    default: []
-            webrender-sw:
-                by-test-platform:
-                    android-em-7.0-x86_64-qr/debug: []
-                    .*-32.*/.*: []
-                    linux.*64-qr/debug: built-projects
-                    windows.*-qr/debug: built-projects
-                    default: []
             headless:
                 by-test-platform:
                     android.*: []
@@ -416,8 +387,8 @@ web-platform-tests-wdspec:
                     default: built-projects
             no-fission:
                 by-test-platform:
-                    linux1804-64-qr/debug: ['trunk']
-                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
+                    linux1804-64-qr/debug: ['mozilla-central']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['mozilla-central']
                     android.*: built-projects
                     default: []
             default:
@@ -425,7 +396,13 @@ web-platform-tests-wdspec:
                     android.*: []
                     .*wayland.*: []
                     default: built-projects
-    tier: default
+    tier:
+        by-variant:
+            no-fission:
+                by-test-platform:
+                    linux.*: 2
+                    default: default
+            default: default
     fetches:
         toolchain:
             by-test-platform:
@@ -436,6 +413,7 @@ web-platform-tests-wdspec:
                     - linux64-geckodriver
                     - linux64-minidump-stackwalk
                     - linux64-fix-stacks
+                    - linux64-hostutils
                 linux.*64.*:
                     - linux64-geckodriver
                     - linux64-minidump-stackwalk
@@ -486,14 +464,14 @@ web-platform-tests-crashtest:
             webrender-sw+no-fission:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug: built-projects
-                    linux1804-64-qr/debug: ['trunk']
-                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
+                    linux1804-64-qr/debug: ['mozilla-central']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['mozilla-central']
                     default: []
             no-fission:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug-isolated-process: []
-                    linux1804-64-qr/debug: ['trunk']
-                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
+                    linux1804-64-qr/debug: ['mozilla-central']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['mozilla-central']
                     android.*: built-projects
                     default: []
             default:
@@ -501,7 +479,17 @@ web-platform-tests-crashtest:
                     android.*: []
                     android-em-7.0-x86_64-qr/debug: built-projects
                     default: built-projects
-    tier: default
+    tier:
+        by-variant:
+            no-fission:
+                by-test-platform:
+                    linux.*: 2
+                    default: default
+            webrender-sw+no-fission:
+                by-test-platform:
+                    linux.*: 2
+                    default: default
+            default: default
 
 web-platform-tests-print-reftest:
     description: "Web platform print-reftest run"
@@ -509,7 +497,17 @@ web-platform-tests-print-reftest:
     treeherder-symbol: W(Wp)
     chunks: 1
     test-manifest-loader: null  # don't load tests in the taskgraph
-    tier: default
+    tier:
+        by-variant:
+            no-fission:
+                by-test-platform:
+                    linux.*: 2
+                    default: default
+            webrender-sw+no-fission:
+                by-test-platform:
+                    linux.*: 2
+                    default: default
+            default: default
     variants:
         - no-fission
         - webrender-sw
@@ -526,13 +524,13 @@ web-platform-tests-print-reftest:
             webrender-sw+no-fission:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug: built-projects
-                    linux1804-64-qr/debug: ['trunk']
-                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
+                    linux1804-64-qr/debug: ['mozilla-central']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['mozilla-central']
                     default: []
             no-fission:
                 by-test-platform:
-                    linux1804-64-qr/debug: ['trunk']
-                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
+                    linux1804-64-qr/debug: ['mozilla-central']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['mozilla-central']
                     android.*: built-projects
                     default: []
             default:
diff --git a/taskcluster/ci/test/xpcshell.yml b/taskcluster/ci/test/xpcshell.yml
index 46ecd690e5..02a615bdc2 100644
--- a/taskcluster/ci/test/xpcshell.yml
+++ b/taskcluster/ci/test/xpcshell.yml
@@ -51,6 +51,11 @@ xpcshell:
         - socketprocess_networking
         - no-fission
         - msix
+        - geckoview-no-fission-ship
+    instance-size:
+        by-variant:
+            conditioned_profile: large
+            default: large-noscratch
     run-on-projects:
         by-variant:
             conditioned_profile:
@@ -61,27 +66,32 @@ xpcshell:
                     default: []
             socketprocess_networking+no-fission:
                 by-test-platform:
-                    linux1804-64.*: ['trunk']
+                    linux1804-64.*: ['mozilla-central']
                     default: []
             socketprocess_networking:
                 by-test-platform:
-                    (linux1804-64|macosx).*: ['trunk']  # All Linux & Mac variants
+                    macosx1015.*: ['trunk']  # All Mac variants
                     ^(?!.*asan).*windows11.*: ['trunk']   # All Windows11 except ASAN
                     default: []
             no-fission:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug-isolated-process: []
                     android.*: built-projects
-                    linux1804-64.*: ['trunk']
+                    linux1804-64.*: ['mozilla-central']
                     default: []
             msix:
                 by-test-platform:
                     windows11-64-2009(-shippable)?-qr/opt: built-projects
                     windows11-64-2009-qr/debug: built-projects
                     default: []
+            geckoview-no-fission-ship:
+                by-test-platform:
+                    android-em-7.0-x86_64-qr/debug-isolated-process: []
+                    android-em.*: built-projects
+                    default: []
             default:
                 by-test-platform:
-                    android.*: []
+                    android.*: built-projects
                     .*wayland.*: []
                     windows.*-asan-qr/opt: []  # No XPCShell on ASAN yet
                     default: built-projects
@@ -89,7 +99,7 @@ xpcshell:
         by-test-platform:
             .*-asan-qr/opt: 4
             .*-ccov.*/.*: 8
-            .*-tsan-qr/opt: 8
+            .*-tsan-qr/opt: 10
             (android-em-7.*|macosx.*|linux1804-64.*/opt): 2
             default: 4
     max-run-time:
@@ -103,10 +113,20 @@ xpcshell:
                     default: 5400
     allow-software-gl-layers: false
     tier:
-        by-test-platform:
-            windows.*-asan.*: 3
-            android-em-7.0-x86_64-qr/debug-isolated-process: 3
-            default: default
+        by-variant:
+            no-fission:
+                by-test-platform:
+                    linux.*: 2
+                    default: default
+            socketprocess_networking+no-fission:
+                by-test-platform:
+                    linux.*: 2
+                    default: default
+            default:
+                by-test-platform:
+                    windows.*-asan.*: 3
+                    android-em-7.0-x86_64-qr/debug-isolated-process: 3
+                    default: default
     mozharness:
         extra-options:
             by-test-platform:
@@ -138,6 +158,7 @@ xpcshell:
                     - android-emulator-linux
                     - linux64-node
                     - linux64-minidump-stackwalk
+                    - linux64-hostutils
 
 xpcshell-failures:
     description: "xpcshell specific failures test run"