Merging upstream version 126.0.

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

1 files changed, 77 insertions, 79 deletions

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: