From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:35:49 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 taskcluster/ci/test/test-platforms.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'taskcluster/ci/test/test-platforms.yml')

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
-- 
cgit v1.2.3