Merging upstream version 125.0.1.

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

9 files changed, 211 insertions, 29 deletions

diff --git a/taskcluster/ci/test/browsertime-desktop.yml b/taskcluster/ci/test/browsertime-desktop.yml
index b1422e1b2f..fab92c40a6 100644
--- a/taskcluster/ci/test/browsertime-desktop.yml
+++ b/taskcluster/ci/test/browsertime-desktop.yml
@@ -103,6 +103,11 @@ 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
@@ -179,6 +184,11 @@ 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
@@ -208,6 +218,11 @@ 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
@@ -283,6 +298,13 @@ 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
@@ -304,6 +326,8 @@ browsertime-benchmark:
                 macosx1400.*shippable.*:
                     - [speedometer, sp]
                     - [speedometer3, sp3]
+                    - [motionmark-1-3, mm-1.3]
+                    - [motionmark-htmlsuite-1-3, mm-h-1.3]
                 default:
                     by-app:
                         firefox:
@@ -315,6 +339,8 @@ browsertime-benchmark:
                             - [motionmark-animometer-ramp, mm-ar]
                             - [motionmark-htmlsuite-ramp, mm-hr]
                             - [motionmark-htmlsuite, mm-h]
+                            - [motionmark-1-3, mm-1.3]
+                            - [motionmark-htmlsuite-1-3, mm-h-1.3]
                             - [speedometer, sp]
                             - [speedometer3, sp3]
                             - [stylebench, sb]
@@ -331,6 +357,8 @@ browsertime-benchmark:
                             - [motionmark-htmlsuite, mm-h]
                             - [motionmark-animometer-ramp, mm-ar]
                             - [motionmark-htmlsuite-ramp, mm-hr]
+                            - [motionmark-1-3, mm-1.3]
+                            - [motionmark-htmlsuite-1-3, mm-h-1.3]
                             - [speedometer, sp]
                             # - [speedometer3, sp3] Perma fails on osx 10.15.x machines (Bug 1809535)
                             - [stylebench, sb]
@@ -342,6 +370,8 @@ browsertime-benchmark:
                             - [speedometer3, sp3]
                             - [motionmark-animometer-ramp, mm-ar]
                             - [motionmark-htmlsuite-ramp, mm-hr]
+                            - [motionmark-1-3, mm-1.3]
+                            - [motionmark-htmlsuite-1-3, mm-h-1.3]
                         chrome:
                             by-test-platform:
                                 macosx1015.*shippable.*:
@@ -351,6 +381,8 @@ browsertime-benchmark:
                                     - [matrix-react-bench, mrb]
                                     - [motionmark-animometer, mm-a]
                                     - [motionmark-htmlsuite, mm-h]
+                                    - [motionmark-1-3, mm-1.3]
+                                    - [motionmark-htmlsuite-1-3, mm-h-1.3]
                                     - [speedometer, sp]
                                     - [speedometer3, sp3]
                                     - [stylebench, sb]
@@ -366,6 +398,8 @@ browsertime-benchmark:
                                     - [motionmark-animometer-ramp, mm-ar]
                                     - [motionmark-htmlsuite, mm-h]
                                     - [motionmark-htmlsuite-ramp, mm-hr]
+                                    - [motionmark-1-3, mm-1.3]
+                                    - [motionmark-htmlsuite-1-3, mm-h-1.3]
                                     - [speedometer, sp]
                                     - [speedometer3, sp3]
                                     - [stylebench, sb]
@@ -381,6 +415,8 @@ browsertime-benchmark:
                             - [motionmark-animometer-ramp, mm-ar]
                             - [motionmark-htmlsuite, mm-h]
                             - [motionmark-htmlsuite-ramp, mm-hr]
+                            - [motionmark-1-3, mm-1.3]
+                            - [motionmark-htmlsuite-1-3, mm-h-1.3]
                             - [speedometer, sp]
                             - [speedometer3, sp3]
                             - [stylebench, sb]
@@ -462,6 +498,8 @@ browsertime-benchmark:
             motionmark-htmlsuite: 1500
             motionmark-htmlsuite-ramp: 3000
             motionmark-animometer-ramp: 2100
+            motionmark-1-3: 3000
+            motionmark-htmlsuite-1-3: 3000
             unity-webgl: 2400
             speedometer3:
                 by-test-platform:
@@ -863,6 +901,11 @@ 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
diff --git a/taskcluster/ci/test/browsertime-mobile.yml b/taskcluster/ci/test/browsertime-mobile.yml
index 89bbc5fb6b..8e685a590e 100644
--- a/taskcluster/ci/test/browsertime-mobile.yml
+++ b/taskcluster/ci/test/browsertime-mobile.yml
@@ -87,6 +87,8 @@ browsertime-tp6m:
         mozharness:
             extra-options:
                 - --chimera
+                # Bug 1884667 - Fresh profiles cause high frequency intermittents
+                - --conditioned-profile=settled
         tier:
             by-app:
                 geckoview: 1
@@ -115,7 +117,7 @@ browsertime-tp6m:
             - reddit
             - sina
             - [stackoverflow, stacko]
-            - web-de
+            - bild-de
             - wikipedia
             - youtube
     run-on-projects:
@@ -292,7 +294,7 @@ browsertime-tp6m-live:
             - [stackoverflow, stacko]
             - [stackoverflow-question, stack-q]
             - [urbandictionary-define, urbict-def]
-            - web-de
+            - bild-de
             - [wikia-marvel, wikia-m]
             - wikipedia
             - youtube
@@ -378,11 +380,12 @@ browsertime-benchmark-speedometer3-mobile:
                 by-test-platform:
                     android-hw-a51.*shippable-qr.*: [trunk-only]
                     default: []
-            cstm-car-m:
+            cstm-car-m: [mozilla-central]
+            chrome-m:
                 by-test-platform:
-                    android-hw-p6.*shippable-qr.*: []
-                    android-hw-s21.*shippable-qr.*: []
-                    default: [mozilla-central]
+                    android-hw-p6.*shippable-qr.*: [mozilla-central]
+                    android-hw-s21.*shippable-qr.*: [mozilla-central]
+                    default: []
             default: []
     treeherder-symbol: Btime(sp3)
     mozharness:
@@ -409,6 +412,24 @@ browsertime-benchmark-motionmark:
     treeherder-symbol: Btime()
     tier: 2
 
+browsertime-benchmark-motionmark-1-3:
+    description: Raptor (browsertime) Motionmark 1.3 benchmark tests
+    run-without-variant: false
+    raptor:
+        apps: [geckoview, fenix, chrome-m, cstm-car-m]
+        subtests:
+            - [motionmark-1-3, mm-1.3]
+            - [motionmark-htmlsuite-1-3, mm-h-1.3]
+    run-on-projects:
+        by-app:
+            chrome-m: []
+            default:
+                by-test-platform:
+                    android-hw-a51-.*aarch64-shippable-qr.*: [mozilla-central]
+                    default: []
+    treeherder-symbol: Btime()
+    tier: 2
+
 browsertime-benchmark-unity-webgl-mobile:
     description: Browsertime Unity WebGL on Android
     run-without-variant: false
diff --git a/taskcluster/ci/test/misc.yml b/taskcluster/ci/test/misc.yml
index b31860a165..ba6fd7aec8 100644
--- a/taskcluster/ci/test/misc.yml
+++ b/taskcluster/ci/test/misc.yml
@@ -8,7 +8,7 @@ job-defaults:
 geckoview-junit:
     description: "Geckoview junit run"
     suite: geckoview-junit
-    variants: ["geckoview-fission", "no-fission"]
+    variants: ["geckoview-fission", "no-fission", "geckoview-no-fission-ship"]
     treeherder-symbol: gv-junit
     loopback-video: true
     target: geckoview-androidTest.apk
@@ -17,6 +17,7 @@ geckoview-junit:
         by-variant:
             geckoview-fission: ['trunk']
             no-fission: built-projects
+            geckoview-no-fission-ship: built-projects
             default: []
     tier: default
     mozharness:
diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml
index f2399d7116..afe9530364 100644
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -783,8 +783,8 @@ mochitest-media:
                     default: []
             media-gpu:
                 by-test-platform:
-                    .*hw-ref.*: []
-                    (macosx.*64|windows11.*)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central', 'mozilla-beta']
+                    windows11.*hw-ref.*: ['autoland', 'mozilla-central', 'mozilla-beta']
+                    (macosx.*64)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central', 'mozilla-beta']
                     default: []
                     # TODO : add Android, it hasn't supported 'tags'
                     # TODO : add Linux, it would crash on gfxFeature.cpp:180
diff --git a/taskcluster/ci/test/talos.yml b/taskcluster/ci/test/talos.yml
index f622eef18e..28da3b47f4 100644
--- a/taskcluster/ci/test/talos.yml
+++ b/taskcluster/ci/test/talos.yml
@@ -677,6 +677,8 @@ talos-webgl:
             webgl-ipc:
                 by-test-platform:
                     (linux1804|windows10|macosx1015)-64.*: [trunk]
+                    windows11-64-2009-hw-ref-shippable.*: [trunk]
+                    windows11(?!.*shippable).*: []
                     default: []
             webrender-sw:
                 by-test-platform:
@@ -685,14 +687,14 @@ talos-webgl:
             default:
                 by-test-platform:
                     windows.*-32.*: []
-                    (linux|windows10-64|macos)(?!.*shippable).*: []
-                    (linux|windows10-64|macos)(?!.*-qr).*: []
+                    (linux|windows10-64|windows11|macos)(?!.*shippable).*: []
+                    (linux|windows10-64|windows11|macos)(?!.*-qr).*: []
                     default: [trunk]
     max-run-time: 2100
     mozharness:
         extra-options:
             by-test-platform:
-                windows10-64-ref-hw.*:
+                windows(10-64-ref-hw|11-64-2009-hw-ref).*:
                     - --suite=webgl
                     - --skip-preflight
                 default:
diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml
index 777652f191..0f124e0878 100644
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -203,6 +203,7 @@ windows11-64-2009-hw-ref-shippable/opt:
             msix: repackage-signing-msix-win64/opt
             default: build-signing-win64/opt
     test-sets:
+        - talos-ref-hw
         - windows-ref-hw-tests
 
 windows11-64-2009-hw-ref/opt:
@@ -212,6 +213,7 @@ windows11-64-2009-hw-ref/opt:
             msix: repackage-signing-msix-win64/opt
             default: build-signing-win64/opt
     test-sets:
+        - talos-ref-hw
         - windows-ref-hw-tests
 
 windows10-64-shippable-qr/opt:
diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index 90ef2145fe..16807b5b9e 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -490,6 +490,7 @@ android-hw-browsertime:
     - browsertime-youtube-playback-mobile
     - browsertime-benchmark-unity-webgl-mobile
     - browsertime-benchmark-motionmark
+    - browsertime-benchmark-motionmark-1-3
 
 android-hw-browsertime-profiling:
     - browsertime-tp6m-profiling
diff --git a/taskcluster/ci/test/variants.yml b/taskcluster/ci/test/variants.yml
index 1bfe00d001..c57a332a91 100644
--- a/taskcluster/ci/test/variants.yml
+++ b/taskcluster/ci/test/variants.yml
@@ -19,6 +19,15 @@ headless:
     mozinfo: "headless"
     replace:
         tier: 2
+    when:
+        $eval: '(
+                    "linux" in task["test-platform"]
+                    && (
+                        "mochitest-plain" in task["try-name"]
+                        || "marionette" in task["try-name"]
+                    )
+                )
+                || "web-platform-tests-wdspec" == task["try-name"]'
     merge:
         mozharness:
             extra-options:
@@ -27,11 +36,24 @@ headless:
 a11y-checks:
     description: "{description} with accessibility checks enabled"
     component: "Core::Disability Access APIs"
-    expiration: "2024-03-01"
+    expiration: "2024-09-01"
     suffix: "a11y-checks"
     mozinfo: "a11y_checks"
     replace:
         tier: 2
+    when:
+        $eval: '(
+                    "linux" in task["test-platform"]
+                    && "opt" in task["test-platform"]
+                    && !(
+                        "asan" in task["test-platform"]
+                        || "tsan" in task["test-platform"]
+                        || "ccov" in task["test-platform"]
+                    )
+                ) && (
+                    "mochitest-devtools-chrome" == task["try-name"]
+                    || "mochitest-browser-chrome" == task["try-name"]
+                )'
     merge:
         mozharness:
             extra-options:
@@ -40,7 +62,7 @@ a11y-checks:
 aab:
     description: "{description} with aab test_runner"
     component: "GeckoView::General"
-    expiration: "2024-03-01"
+    expiration: "2024-09-01"
     when: &gv_e10s_filter
         $eval: '"android" in task["test-platform"]'
     suffix: "aab"
@@ -61,7 +83,7 @@ aab:
 geckoview-no-fission:
     description: "{description} without fission enabled"
     component: "GeckoView::Sandboxing"
-    expiration: "2024-03-01"
+    expiration: "2024-09-01"
     when:
         <<: *gv_e10s_filter
     suffix: "nofis"
@@ -74,7 +96,7 @@ geckoview-no-fission:
 geckoview-fission:
     description: "{description} with fission enabled and default isolation strategy"
     component: "GeckoView::Sandboxing"
-    expiration: "2024-03-01"
+    expiration: "2024-09-01"
     when:
         <<: *gv_e10s_filter
     suffix: "fis"
@@ -83,7 +105,7 @@ geckoview-fission:
 geckoview-fission-isolate-high-value:
     description: "{description} with fission enabled and isolation strategy isolateHighValue"
     component: "GeckoView::Sandboxing"
-    expiration: "2024-03-01"
+    expiration: "2024-09-01"
     when:
         <<: *gv_e10s_filter
     suffix: "fis-hv"
@@ -96,13 +118,31 @@ geckoview-fission-isolate-high-value:
 no-fission:
     description: "{description} without fission enabled"
     component: "Core::DOM: Content Processes"
-    expiration: "2024-03-01"
+    expiration: "2024-09-01"
     suffix: "nofis"
     mozinfo: "fission"
+    when:
+        $eval: '
+                "linux" in task["test-platform"]
+                || "android" in task["test-platform"]
+                '
+    merge:
+        mozharness:
+            extra-options:
+                - "--disable-fission"
+
+geckoview-no-fission-ship:
+    description: "{description} with fission disabled and ship enabled"
+    component: "GeckoView::Sandboxing"
+    expiration: "2024-09-01"
+    suffix: "nofis-ship"
+    when:
+        <<: *gv_e10s_filter
     merge:
         mozharness:
             extra-options:
                 - "--disable-fission"
+                - "--setpref=fission.disableSessionHistoryInParent=false"
 
 xorigin:
     description: "{description} with cross-origin"
@@ -112,6 +152,8 @@ xorigin:
     mozinfo: "xorigin"
     replace:
         e10s: true
+    when:
+        $eval: '"mochitest-plain" in task["try-name"]'
     merge:
         mozharness:
             extra-options:
@@ -121,9 +163,25 @@ xorigin:
 conditioned_profile:
     description: "{description} with conditioned profile"
     component: "Testing::General"
-    expiration: "2024-03-01"
+    expiration: "2024-09-01"
     suffix: "condprof"
     mozinfo: "condprof"
+    when:
+        $eval: '
+                (
+                    "linux" in task["test-platform"]
+                    || "windows" in task["test-platform"]
+                ) && (
+                    "opt" in task["test-platform"]
+                    && !(
+                        "asan" in task["test-platform"]
+                        || "tsan" in task["test-platform"]
+                        || "ccov" in task["test-platform"]
+                    )
+                ) && (
+                    "mochitest-plain" == task["try-name"]
+                    || "xpcshell" == task["try-name"]
+                )'
     merge:
         mozharness:
             extra-options:
@@ -137,6 +195,8 @@ socketprocess:
     expiration: "2024-09-01"
     suffix: "spi"
     mozinfo: "socketprocess_e10s"
+    when:
+        $eval: '"mochitest-media" in task["try-name"]'
     merge:
         mozharness:
             extra-options:
@@ -149,6 +209,16 @@ socketprocess_networking:
     expiration: "2024-09-01"
     suffix: "spi-nw"
     mozinfo: "socketprocess_networking"
+    when:
+        $eval: '
+                (
+                    "linux" in task["test-platform"]
+                    || "windows" in task["test-platform"]
+                    || "macosx" in task["test-platform"]
+                ) && (
+                    "mochitest" in task["try-name"]
+                    || "xpcshell" == task["try-name"]
+                )'
     merge:
         mozharness:
             extra-options:
@@ -161,7 +231,7 @@ socketprocess_networking:
 webrender-dcomp-disabled:
     description: "{description} with dcomp disabled"
     component: "Core::Graphics: WebRender"
-    expiration: "2024-03-01"
+    expiration: "2024-09-01"
     suffix: "wr-dc0"
     when:
         $eval: '"windows1" in task["test-platform"]'
@@ -177,7 +247,7 @@ webrender-dcomp-disabled:
 webrender-dcomp-present:  # Default variant ends up like this.
     description: "{description} with dcomp present but not overlays"
     component: "Core::Graphics: WebRender"
-    expiration: "2024-03-01"
+    expiration: "2024-09-01"
     suffix: "wr-dc1-p"
     when:
         $eval: '"windows1" in task["test-platform"]'
@@ -193,7 +263,7 @@ webrender-dcomp-present:  # Default variant ends up like this.
 webrender-dcomp-overlays:
     description: "{description} with dcomp overlays but not compositing"
     component: "Core::Graphics: WebRender"
-    expiration: "2024-03-01"
+    expiration: "2024-09-01"
     suffix: "wr-dc2-o"
     when:
         $eval: '"windows1" in task["test-platform"]'
@@ -209,7 +279,7 @@ webrender-dcomp-overlays:
 webrender-dcomp-compositing:
     description: "{description} with dcomp compositing"
     component: "Core::Graphics: WebRender"
-    expiration: "2024-03-01"
+    expiration: "2024-09-01"
     suffix: "wr-dc3-c"
     when:
         $eval: '"windows1" in task["test-platform"]'
@@ -227,7 +297,7 @@ webrender-dcomp-compositing:
 webrender-sw:
     description: "{description} with software webrender enabled"
     component: "Core::Graphics: WebRender"
-    expiration: "2024-03-01"
+    expiration: "2024-09-01"
     suffix: "swr"
     mozinfo: "swgl"
     merge:
@@ -239,7 +309,7 @@ webrender-sw:
 webgl-ipc:
     description: "{description} with WebGL IPC process enabled"
     component: "Core::Graphics: CanvasWebGL"
-    expiration: "2024-03-01"
+    expiration: "2024-09-01"
     suffix: "gli"
     merge:
         mozharness:
@@ -252,6 +322,17 @@ devtools-no-eft:
     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:
@@ -260,7 +341,7 @@ devtools-no-eft:
 wmf-media-engine:
     description: "{description} with Windows Media Foundation media engine enabled"
     component: "Core::Audio/Video: Playback"
-    expiration: "2024-04-10"
+    expiration: "2024-10-10"
     when:
         $eval: '"windows1" in task["test-platform"]'
     suffix: "wmfme"
@@ -274,6 +355,7 @@ wmf-media-engine:
                 - "--setpref=media.wmf.media-engine.enabled=1"
                 - "--setpref=media.wmf.media-engine.channel-decoder.enabled=true"
                 - "--setpref=media.eme.wmf.clearkey.enabled=true"
+                - "--setpref=media.wmf.media-engine.bypass-gfx-blocklist=true"
 
 media-gpu:
     description: "{description} for running media tests on the GPU worker"
@@ -281,6 +363,11 @@ media-gpu:
     expiration: "2024-04-21"
     suffix: "mda-gpu"
     mozinfo: "mda_gpu"
+    when:
+        $eval: '
+                    "windows" in task["test-platform"]
+                    || "macosx" in task["test-platform"]
+                '
     merge:
         virtualization: virtual-with-gpu
         mozharness:
@@ -295,7 +382,17 @@ msix:
     suffix: "msix"
     mozinfo: "msix"
     when:
-        $eval: '"windows1" in task["test-platform"] && "-64" in task["test-platform"] && ("opt" in task["test-platform"] || "debug" in task["test-platform"]) && !("asan" in task["test-platform"]) && !("ccov" in task["test-platform"])'
+        $eval: '
+                    "windows1" in task["test-platform"]
+                    && "-64" in task["test-platform"]
+                    && (
+                        "opt" in task["test-platform"]
+                        || "debug" in task["test-platform"]
+                    ) && !(
+                        "asan" in task["test-platform"]
+                        || "ccov" in task["test-platform"]
+                    )
+                '
     merge:
         mozharness:
             extra-options:
@@ -307,6 +404,14 @@ http3:
     expiration: "2024-09-01"
     suffix: "http3"
     mozinfo: "http3"
+    when:
+        $eval: '(
+                    "linux" in task["test-platform"]
+                    && "debug" in task["test-platform"]
+                ) && (
+                    "mochitest-plain" == task["try-name"]
+                    || "mochitest-devtools-chrome" == task["try-name"]
+                )'
     merge:
         mozharness:
             extra-options:
@@ -318,6 +423,13 @@ http2:
     expiration: "2024-09-01"
     suffix: "http2"
     mozinfo: "http2"
+    when:
+        $eval: '(
+                    "linux" in task["test-platform"]
+                    && "debug" in task["test-platform"]
+                )
+                    && "mochitest-plain" == task["try-name"]
+                '
     merge:
         mozharness:
             extra-options:
diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml
index 5f850d16c1..4ef9721fe6 100644
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -378,9 +378,9 @@ web-platform-tests-wdspec:
     treeherder-symbol: W(Wd)
     chunks:
         by-test-platform:
-            .*-ccov.*/.*: 4
+            .*-ccov.*/.*: 6
             .*-tsan.*/.*: 8
-            default: 3
+            default: 5
     mozharness:
         extra-options:
             by-test-platform: