Backed out changeset f259e02b50c5 (bug 1816568) for causing wpt unexpected passes. CLOSED TREE

2023-02-24 17:15:45 +02:00 · 2023-02-24 17:15:45 +02:00 · 006f28c4f8
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@ -641,16 +641,6 @@ workers:
            implementation: generic-worker
            os: windows
            worker-type: '{alias}'
-        t-win11-64(|-gpu-s|-source):
-            provisioner: '{trust-domain}-t'
-            implementation: generic-worker
-            os: windows
-            worker-type: '{alias}'
-        win11-64-2009(|-gpu|-ssd|-source|-ssd-gpu):
-            provisioner: 'gecko-t'
-            implementation: generic-worker
-            os: windows
-            worker-type: '{alias}'
        t-win7-32-gpu:
            provisioner: '{trust-domain}-t'
            implementation: generic-worker
--- a/taskcluster/ci/test/awsy.yml
+++ b/taskcluster/ci/test/awsy.yml
@ -8,7 +8,7 @@ job-defaults:
    instance-size: xlarge
    virtualization:
        by-test-platform:
-            windows.*(?:-shippable)?-qr/.*: virtual-with-gpu
+            windows10-64-2004(?:-shippable)?-qr/.*: virtual-with-gpu
            default: virtual
    allow-software-gl-layers: false
    mozharness:
@ -37,7 +37,7 @@ awsy-tp6:
        by-test-platform:
            .*-devedition/.*: []  # don't run on devedition
            windows.*-32.*/opt: []
-            (linux|windows|mac)(?!.*shippable).*/opt: []
+            (linux|windows10-64-2004|mac)(?!.*shippable).*/opt: []
            default: [integration, mozilla-central, mozilla-beta, mozilla-release]
    mozharness:
        extra-options:
@ -58,7 +58,7 @@ awsy-base:
        by-test-platform:
            .*-devedition/.*: []  # don't run on devedition.
            windows.*-32.*/opt: []
-            (linux|windows|mac)(?!.*shippable).*/opt: []
+            (linux|windows10-64-2004|mac)(?!.*shippable).*/opt: []
            default: [integration, mozilla-central, mozilla-beta, mozilla-release]
    tier: default
    mozharness:
--- a/taskcluster/ci/test/compiled.yml
+++ b/taskcluster/ci/test/compiled.yml
@ -82,15 +82,15 @@ jittest:
            default: []
    chunks:
        by-test-platform:
-            windows.*-ccov-qr/opt: 8
            windows.*: 1
+            windows10-64-2004-ccov-qr/opt: 8
            macosx.*/opt: 1
            macosx.*/debug: 3
            android.*: 10
            default: 6
    max-run-time:
        by-test-platform:
-            windows.*-ccov.*/.*: 7200
+            windows10-64-2004-ccov.*/.*: 7200
            macosx.*-ccov.*/.*: 7200
            android-hw.*: 5400
            default: 3600
--- a/taskcluster/ci/test/kind.yml
+++ b/taskcluster/ci/test/kind.yml
@ -58,11 +58,11 @@ job-defaults:
        requires-signed-builds:
            by-test-platform:
                macosx1100.*: true
-                windows1.*-64.*-shippable-qr/opt:
+                windows10-64-2004-shippable-qr/opt:
                    by-variant:
                        msix: true
                        default: false
-                windows1.*-64.*-qr/opt:
+                windows10-64-2004-qr/opt:
                    by-variant:
                        msix: true
                        default: false
--- a/taskcluster/ci/test/misc.yml
+++ b/taskcluster/ci/test/misc.yml
@ -247,7 +247,7 @@ test-coverage-gpu:
            default: []
    tier:
        by-test-platform:
-            windows.*asan.*: 3
+            windows10-64-asan.*: 3
            default: 2
    mozharness:
        script:
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@ -9,11 +9,11 @@ job-defaults:
        by-test-platform:
            android-em-7.*: geckoview-test_runner.apk
            android-hw.*: geckoview-test_runner.apk
-            windows1.*-shippable-qr/opt:
+            windows10-64-2004-shippable-qr/opt:
                by-variant:
                    msix: target.installer.msix
                    default: null
-            windows1.*-qr/opt:
+            windows10-64-2004-qr/opt:
                by-variant:
                    msix: target.installer.msix
                    default: null
@ -70,24 +70,18 @@ mochitest-plain:
        by-variant:
            conditioned_profile:
                by-test-platform:
-                    .*asan.*: []
-                    .*ccov.*: []
                    linux1804-64(-shippable)?-qr/opt: ['trunk']
-                    windows1.*64.*(-shippable)?-qr/opt: ['trunk']
+                    windows10-64-2004(-shippable)?-qr/opt: ['trunk']
                    default: []
            xorigin:
                by-test-platform:
-                    .*asan.*: []
-                    windows.*ccov.*: []
-                    (linux.*64|macosx.*64|windows1.*)(-shippable)?-qr/(opt|debug): ['trunk']
+                    (linux.*64|macosx.*64|windows10.*2004)(-shippable)?-qr/(opt|debug|asan|tsan): ['trunk']
                    windows.*64-ccov-qr/opt: ['mozilla-central']
                    linux.*64-ccov-qr/opt: ['mozilla-central']
                    default: []
            socketprocess_networking:
                by-test-platform:
-                    .*asan.*: []
-                    .*ccov.*: []
-                    (linux.*64|macosx.*64|windows1.*-64.*)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
+                    (linux.*64|macosx.*64|windows10-64-2004)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
                    default: []
            webrender-sw+no-fission:
                by-test-platform:
@ -129,7 +123,7 @@ mochitest-plain:
            linux.*64-asan/opt: 10
            linux.*64-tsan-qr/opt: 20
            linux.*64-.*cov/opt: 10
-            windows.*-ccov.*/.*: 10
+            windows10-64-2004-ccov.*/.*: 10
            macosx.*64-ccov.*/.*: 10
            default: 5
    instance-size:
@ -199,7 +193,7 @@ 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
+                    windows10-64-2004-qr/debug: built-projects
                    default: []
            webrender-sw+a11y-checks:
                by-test-platform:
@ -207,14 +201,12 @@ mochitest-browser-chrome:
                    default: []
            socketprocess_networking:
                by-test-platform:
-                    .*asan.*: []
-                    .*ccov.*: []
-                    (linux.*64|macosx.*64|windows1.*-64.*)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
+                    (linux.*64|macosx.*64|windows10-64-2004)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
                    default: []
            msix:
                by-test-platform:
-                    windows1.*-shippable-qr/opt: built-projects
-                    windows1.*-qr/opt: built-projects
+                    windows10-64-2004-shippable-qr/opt: built-projects
+                    windows10-64-2004-qr/opt: built-projects
                    default: []
            default:
                by-test-platform:
@ -234,10 +226,10 @@ mochitest-browser-chrome:
            linux.*64-asan-qr/opt: 16
            linux.*64-tsan-qr/opt: 32
            macosx.*64/debug: 16
-            windows.*-ccov.*/.*: 14
-            windows.*-asan-qr/opt: 12
+            windows10-64-2004-ccov.*/.*: 14
+            windows10.*-asan-qr/opt: 12
+            windows10-32-qr/debug: 12
            windows7-32.*: 20
-            windows.*32-qr/debug: 12
            default: 7
    max-run-time:
        by-variant:
@ -245,7 +237,7 @@ mochitest-browser-chrome:
            default:
                by-test-platform:
                    linux.*64-ccov.*/.*: 9000
-                    windows.*-ccov.*/.*: 10800
+                    windows10-64-2004-ccov.*/.*: 10800
                    macosx.*64-ccov.*/.*: 10800
                    linux.*64-tsan-qr/opt: 10800
                    linux.*-qr/opt: 5400
@ -305,7 +297,7 @@ mochitest-browser-media:
            wmf-media-engine:
                by-test-platform:
                    .*asan.*: []
-                    windows1.*-64.*: ['autoland', 'mozilla-central']
+                    windows10-64-2004.*: ['autoland', 'mozilla-central']
                    default: []
            default:
                by-test-platform:
@ -353,9 +345,7 @@ mochitest-chrome:
        by-variant:
            socketprocess_networking+1proc:
                by-test-platform:
-                    .*asan.*: []
-                    .*ccov.*: []
-                    (linux.*64|macosx.*64|windows1.*-64.*)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
+                    (linux.*64|macosx.*64|windows10-64-2004)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
                    default: []
            webrender-sw+1proc:
                by-test-platform:
@ -400,9 +390,7 @@ mochitest-devtools-chrome:
                    default: []
            socketprocess_networking:
                by-test-platform:
-                    .*asan.*: []
-                    .*ccov.*: []
-                    (linux.*64|macosx.*64|windows.*)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
+                    (linux.*64|macosx.*64|windows10-64-2004)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
                    default: []
            webrender-sw:
                by-test-platform:
@ -416,7 +404,7 @@ mochitest-devtools-chrome:
    tier: default
    max-run-time:
        by-test-platform:
-            windows.*-ccov.*/.*: 10800
+            windows10-64-2004-ccov.*/.*: 10800
            macosx.*64-ccov.*/.*: 9000
            linux.*64-ccov.*/.*: 7200
            linux.*64-tsan-qr/opt: 7200
@ -539,7 +527,7 @@ mochitest-media:
    schedules-component: mochitest-plain
    max-run-time:
        by-test-platform:
-            windows.*-ccov.*/.*: 7200
+            windows10-64-2004-ccov.*/.*: 7200
            macosx.*64-ccov.*/.*: 7200
            linux.*64-tsan-qr/opt: 7200
            default: 5400
@ -557,11 +545,10 @@ mochitest-media:
            webgl-ipc:
                by-test-platform:
                    android.*: []
-                    windows.*ccov.*: []
                    linux.*64(-shippable|-asan|-tsan)?-qr/opt: ['autoland', 'mozilla-central']
                    macosx.*64(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
-                    windows1.*(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
-                    windows.*-asan-qr/opt: ['autoland', 'mozilla-central']
+                    windows10-(32|64)-2004(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
+                    windows10-64-2004-asan-qr/opt: ['autoland', 'mozilla-central']
                    default: []
            socketprocess+no-fission:
                by-test-platform:
@ -573,12 +560,11 @@ mochitest-media:
            socketprocess:
                by-test-platform:
                    android.*: []
-                    windows.*ccov.*: []
                    linux.*64(-asan|-devedition|-shippable)?-qr/(opt|debug): built-projects
                    linux.*64-tsan-qr/opt: ['autoland', 'mozilla-central']
                    macosx.*-64(-devedition|-shippable)?-qr/(opt|debug): built-projects
-                    windows1.*(-devedition|-shippable)?-qr/(opt|debug): built-projects
-                    windows.*-asan-qr/opt: ['autoland', 'mozilla-central']
+                    windows10-(32|64)-2004(-devedition|-shippable)?-qr/(opt|debug): built-projects
+                    windows10-64-2004-asan-qr/opt: ['autoland', 'mozilla-central']
                    default: []
            webrender-sw+no-fission:
                by-test-platform:
@ -602,19 +588,19 @@ mochitest-media:
                    default: []
            wmf-media-engine:
                by-test-platform:
-                    windows1.*-64.*: ['autoland', 'mozilla-central']
+                    windows10-64-2004.*: ['autoland', 'mozilla-central']
                    default: []
            msix:
                by-test-platform:
-                    windows1.*-shippable-qr/opt: built-projects
-                    windows1.*-qr/opt: ['autoland']
+                    windows10-64-2004-shippable-qr/opt: built-projects
+                    windows10-64-2004-qr/opt: ['autoland']
                    default: []
            default:
                by-test-platform:
                    android.*: []
                    linux.*(asan|ccov)/opt: []
                    .*(ccov/|asan/|-32).*: built-projects
-                    (android|linux|windows10-64-2004|windows11-64-2009|macos)(?!.*-qr).*: []
+                    (android|linux|windows10-64-2004|macos)(?!.*-qr).*: []
                    default: built-projects
    loopback-video: true
    chunks:
@ -623,7 +609,7 @@ mochitest-media:
            default:
                by-test-platform:
                    (android|macos).*/opt: 1
-                    ^(?!.*asan).*windows1.*/opt: 1
+                    ^(?!.*asan).*windows10.*/opt: 1
                    linux.*/debug: 3
                    linux.*64-tsan-qr/opt: 5
                    default: 2
@ -633,7 +619,7 @@ mochitest-media:
            by-test-platform:
                android.*: false
                macosx.*64.*: false
-                windows1.*: false
+                windows10-64-2004.*: false
                default: true
        extra-options:
            by-test-platform:
@ -750,7 +736,7 @@ mochitest-webgl1-ext:
                    .*-tsan.*: []
                    linux.*-64.*: built-projects
                    mac.*: ["trunk"]
-                    windows.*-64.*: built-projects
+                    windows10-64-2004.*: built-projects
                    default: []
            webrender-sw+no-fission:
                by-test-platform:
@ -964,9 +950,7 @@ mochitest-remote:
        by-variant:
            socketprocess_networking:
                by-test-platform:
-                    .*asan.*: []
-                    .*ccov.*: []
-                    (linux.*64|macosx.*64|windows1.*-64.*)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
+                    (linux.*64|macosx.*64|windows10-64-2004)(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
                    default: []
            webrender-sw+no-fission:
                by-test-platform:
@ -991,4 +975,7 @@ mochitest-remote:
        mochitest-flavor: browser
        extra-options:
            - --setpref=remote.log.level=Trace
-    virtualization: virtual
+    virtualization:
+        by-test-platform:
+            windows10-64.*: virtual
+            default: virtual
--- a/taskcluster/ci/test/reftest.yml
+++ b/taskcluster/ci/test/reftest.yml
@ -60,8 +60,8 @@ crashtest:
                    macosx101.*64-qr/debug: built-projects
                    linux.*-64-qr/debug: built-projects
                    linux.*-64(-tsan|-asan)-qr/opt: built-projects
-                    windows.*-asan-qr/opt: built-projects
-                    windows1.*-64.*-qr/debug: built-projects
+                    windows10-64-2004-asan-qr/opt: built-projects
+                    windows10-64-2004-qr/debug: built-projects
                    default: []
            no-fission:
                by-test-platform:
@ -105,9 +105,9 @@ jsreftest:
        by-test-platform:
            android-hw.*\/debug: 12
            android-hw.*/(opt|pgo)?: 6
-            windows.*-asan-qr/opt: 3
-            windows.*-ccov-qr/opt: 5
            windows.*\/opt: 2
+            windows10-64-2004-asan-qr/opt: 3
+            windows10-64-2004-ccov-qr/opt: 5
            linux.*64-ccov.*/.*: 5
            linux1804-64-qr/opt: 4
            linux1804-64-qr/debug: 5
@ -150,12 +150,11 @@ reftest:
            macosx101.*-64-shippable(-qr)?/opt: 3
            macosx101.*-64/debug: 4
            macosx101.*-64(-ccov.*|-qr)/debug: 6
-            windows.*64.*/debug: 4
-            windows.*32.*/debug: 6
-            windows.*-ccov-qr/opt: 9
-            windows10.*asan.*: 3
-            windows10.*/opt: 2
-            windows11.*/opt: 3
+            windows.*/opt: 2
+            windows10-64-2004.*/debug: 4
+            windows10-32.*/debug: 6
+            windows10-64-2004-asan-qr/opt: 3
+            windows10-64-2004-ccov-qr/opt: 9
            default: 8
    variants:
        - no-fission
@ -178,7 +177,7 @@ reftest:
                    linux1804-64-qr/debug: built-projects
                    linux1804-64(-asan|-tsan)-qr/opt: built-projects
                    macosx101.*64-qr/debug: built-projects
-                    windows.*-asan-qr/opt: built-projects
+                    windows10-64-2004(-asan)?-qr/opt: built-projects
                    windows7-32(?:-shippable)?-qr/opt: built-projects
                    default: []
            no-fission:
@ -195,9 +194,9 @@ reftest:
                    default: built-projects
    max-run-time:
        by-test-platform:
-            windows.*-32-mingwclang-qr/debug: 5400
-            windows.*-ccov.*/.*: 5400
-            windows.*-asan-qr/opt: 5400
+            windows10-32-mingwclang-qr/debug: 5400
+            windows10-64-2004-ccov.*/.*: 5400
+            windows10-64-2004-asan-qr/opt: 5400
            macosx.*64-ccov.*/.*: 5400
            default: 3600
    mozharness:
@ -205,10 +204,11 @@ reftest:
            by-test-platform:
                android-em.*: false
                macosx.*64/opt: false
-                windows.*/opt: false
+                windows10-64-2004.*/opt: false
                default: true
    tier:
        by-test-platform:
+            android-hw-.*-qr/.*: 2
            android-em-7.0-x86_64-qr/debug-isolated-process: 3
            default: default

--- a/taskcluster/ci/test/talos.yml
+++ b/taskcluster/ci/test/talos.yml
@ -766,15 +766,15 @@ talos-xperf:
    run-as-administrator:
        by-test-platform:
            windows.*32.*: false
-            windows10.*64.*: true
-            windows11.*64.*: true
+            windows10-64.*: true
+            windows11-64.*: true
    variants:
        - webrender-sw
    run-on-projects:
        by-test-platform:
            windows.*-32-shippable(?:-qr)?/.*: []
-            windows10.*-shippable-qr/.*: [mozilla-beta, trunk]
-            windows11.*-shippable-qr/.*: [mozilla-beta, trunk]
+            windows10-64.*-shippable-qr/.*: [mozilla-beta, trunk]
+            windows11-64.*-shippable-qr/.*: [mozilla-beta, trunk]
            default: []
    mozharness:
        extra-options:
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@ -172,42 +172,6 @@ windows10-32-2004-mingwclang-qr/opt:
    test-sets:
        - mingwclang-tests-opt

-# win11-32
-windows11-32-2009-shippable-qr/opt:
-    build-platform: win32-shippable/opt
-    test-sets:
-        - awsy
-        - desktop-screenshot-capture
-        # - web-platform-tests
-        - windows32-2004-tests
-
-
-windows11-32-2009-qr/opt:
-    build-platform: win32/opt
-    test-sets:
-        - awsy
-        - desktop-screenshot-capture
-        # - web-platform-tests
-        - windows32-2004-tests
-
-windows11-32-2009-qr/debug:
-    build-platform: win32/debug
-    build-signing-label: build-signing-win32/debug
-    test-sets:
-        # - web-platform-tests
-        - windows-7-tests
-        - windows32-2004-tests
-
-windows11-32-2009-mingwclang-qr/debug:
-    build-platform: win32-mingwclang/debug
-    test-sets:
-        - mingwclang-win32-tests-debug
-
-windows11-32-2009-mingwclang-qr/opt:
-    build-platform: win32-mingwclang/opt
-    test-sets:
-        - mingwclang-tests-opt
-
 # win64
 windows10-64-qr/opt:
    build-platform: win64/opt
@ -294,75 +258,6 @@ windows10-64-2004-mingwclang-qr/opt:
    test-sets:
        - mingwclang-tests-opt

-# win11-64 2009
-# windows11-64-2009-ccov-qr/opt:
-#    build-platform: win64-ccov/opt
-#    build-signing-label: build-signing-win64-ccov/opt
-#    test-sets:
-#        - desktop-screenshot-capture
-#        - ccov-code-coverage-tests
-#        - windows10-64-2004-ccov-tests
-#        - windows10-2004-tests
-
-windows11-64-2009-qr/debug:
-    build-platform: win64/debug
-    build-signing-label: build-signing-win64/debug
-    test-sets:
-        # - web-platform-tests
-        - windows11-2009-tests
-
-windows11-64-2009-qr/opt:
-    build-platform: win64/opt
-    build-signing-label:
-        by-variant:
-            msix: repackage-signing-msix-win64/opt
-            default: build-signing-win64/opt
-    test-sets:
-        - awsy
-        - desktop-screenshot-capture
-        # - web-platform-tests
-        # - web-platform-tests-backlog
-        - windows11-2009-tests
-        - talos-xperf
-
-windows11-64-2009-shippable-qr/opt:
-    build-platform: win64-shippable/opt
-    build-signing-label:
-        by-variant:
-            msix: repackage-signing-shippable-l10n-msix-win64-shippable/opt
-            default: build-signing-win64-shippable/opt
-    test-sets:
-        - awsy
-        - desktop-screenshot-capture
-        # - web-platform-tests
-        # - web-platform-tests-backlog
-        - windows11-2009-tests
-        - talos-xperf
-
-windows11-64-2009-devedition-qr/opt:
-    build-platform: win64-devedition/opt
-    build-signing-label: build-signing-win64-devedition/opt
-    test-sets:
-        - desktop-screenshot-capture
-        # - web-platform-tests
-        - windows11-2009-tests
-
-windows11-64-2009-asan-qr/opt:
-    build-platform: win64-asan/opt
-    test-sets:
-        - windows11-2009-tests
-
-# windows11-64-2009-mingwclang-qr/debug:
-#    build-platform: win64-mingwclang/debug
-#    test-sets:
-#        - mingwclang-tests-debug
-
-# windows11-64-2009-mingwclang-qr/opt:
-#    build-platform: win64-mingwclang/opt
-#    test-sets:
-#        - mingwclang-tests-opt
-
-
 ##
 # MacOS X platforms (matching /macosx.*/)

--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@ -255,36 +255,6 @@ windows10-64-2004-ccov-tests:
    - web-platform-tests-reftest
    - web-platform-tests-wdspec

-windows11-2009-tests:
-    - cppunit
-    - crashtest
-    - firefox-ui-functional
-    - gtest
-    - jsreftest
-    - marionette
-    - mochitest-a11y
-    - mochitest-browser-a11y
-    - mochitest-browser-chrome
-    - mochitest-browser-media
-    - mochitest-chrome
-    - mochitest-chrome-gpu
-    - mochitest-devtools-chrome
-    - mochitest-media
-    - mochitest-plain
-    - mochitest-plain-gpu
-    - mochitest-remote
-    - mochitest-webgpu
-    - mochitest-webgl1-core
-    - mochitest-webgl1-ext
-    - mochitest-webgl2-core
-    - mochitest-webgl2-ext
-    - reftest
-    - telemetry-tests-client
-    - test-verify
-    - test-verify-gpu
-    - test-verify-wpt
-    - xpcshell
-
 mingwclang-tests-debug:
    - cppunit
    - firefox-ui-functional
--- a/taskcluster/ci/test/variants.yml
+++ b/taskcluster/ci/test/variants.yml
@ -147,7 +147,7 @@ webrender-dcomp-disabled:
    expiration: "2023-09-01"
    suffix: "wr-dc0"
    when:
-        $eval: '"windows1" in task["test-platform"]'
+        $eval: '"windows10" in task["test-platform"]'
    merge:
        mozharness:
            extra-options:
@ -163,7 +163,7 @@ webrender-dcomp-present:  # Default variant ends up like this.
    expiration: "2023-09-01"
    suffix: "wr-dc1-p"
    when:
-        $eval: '"windows1" in task["test-platform"]'
+        $eval: '"windows10" in task["test-platform"]'
    merge:
        mozharness:
            extra-options:
@ -179,7 +179,7 @@ webrender-dcomp-overlays:
    expiration: "2023-09-01"
    suffix: "wr-dc2-o"
    when:
-        $eval: '"windows1" in task["test-platform"]'
+        $eval: '"windows10" in task["test-platform"]'
    merge:
        mozharness:
            extra-options:
@ -195,7 +195,7 @@ webrender-dcomp-compositing:
    expiration: "2023-09-01"
    suffix: "wr-dc3-c"
    when:
-        $eval: '"windows1" in task["test-platform"]'
+        $eval: '"windows10" in task["test-platform"]'
    merge:
        mozharness:
            extra-options:
@ -244,7 +244,7 @@ wmf-media-engine:
    component: "Core::Audio/Video:Playback"
    expiration: "2023-04-10"
    when:
-        $eval: '"windows1" in task["test-platform"]'
+        $eval: '"windows10" in task["test-platform"]'
    suffix: "wmfme"
    replace:
        tier: 2
@ -271,7 +271,7 @@ msix:
    expiration: "never"
    suffix: "msix"
    when:
-        $eval: '"windows1" in task["test-platform"] && "-64" in task["test-platform"] && "opt" in task["test-platform"] && !("asan" in task["test-platform"]) && !("ccov" in task["test-platform"])'
+        $eval: '"windows10-64" in task["test-platform"] && "opt" in task["test-platform"] && !("asan" in task["test-platform"]) && !("ccov" in task["test-platform"])'
    merge:
        mozharness:
            extra-options:
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@ -51,7 +51,7 @@ web-platform-tests:
            macosx.*/debug: 18
            windows.*32.*/opt: 12
            windows.*/debug: 14
-            windows.*-ccov.*/opt: 14
+            windows10-64-2004-ccov.*/opt: 14
            default: 10
    max-run-time:
        by-test-platform:
@ -69,14 +69,14 @@ web-platform-tests:
        by-variant:
            webrender-sw:
                by-test-platform:
-                    .*-32.*/.*: []
+                    (linux1804|windows10)-32.*/.*: []
                    linux.*64-qr/debug: built-projects
-                    windows.*-qr/debug: built-projects
+                    windows10-64-2004-qr/debug: built-projects
                    android-em-7.0-x86_64-qr/debug: []
                    default: []
            webrender-sw+no-fission:
                by-test-platform:
-                    .*-32.*/.*: []
+                    (linux1804|windows10)-32.*/.*: []
                    android-em-7.0-x86_64-qr/debug: built-projects
                    linux.*64-qr/debug: built-projects
                    default: []
@ -137,7 +137,7 @@ web-platform-tests-reftest:
    treeherder-symbol: W(Wr)
    virtualization:
        by-test-platform:
-            windows.*-64*-qr/.*: virtual-with-gpu
+            windows10-64-2004.*-qr/.*: virtual-with-gpu
            default: virtual
    chunks:
        by-test-platform:
@ -157,9 +157,9 @@ web-platform-tests-reftest:
        by-variant:
            webrender-sw:
                by-test-platform:
-                    .*-32.*/.*: []
+                    (linux1804|windows10)-32.*/.*: []
                    linux.*64-qr/debug: built-projects
-                    windows.*-qr/debug: built-projects
+                    windows10-64-2004-qr/debug: built-projects
                    default: []
            webrender-sw+no-fission:
                by-test-platform:
@ -248,9 +248,9 @@ web-platform-tests-wdspec:
            webrender-sw:
                by-test-platform:
                    android-em-7.0-x86_64-qr/debug: []
-                    .*-32.*/.*: []
+                    (linux1804|windows10)-32.*/.*: []
                    linux.*64-qr/debug: built-projects
-                    windows.*-qr/debug: built-projects
+                    windows10-64-2004-qr/debug: built-projects
                    default: []
            headless:
                by-test-platform:
@ -320,10 +320,10 @@ web-platform-tests-crashtest:
            webrender-sw:
                by-test-platform:
                    android-em-7.0-x86_64-qr/debug: built-projects
-                    .*-32.*/.*: []
+                    (linux1804|windows10)-32.*/.*: []
                    linux.*64-qr/debug: built-projects
                    macosx101.*64-qr/debug: built-projects
-                    windows.*-qr/debug: built-projects
+                    windows10-64-2004-qr/debug: built-projects
                    default: []
            webrender-sw+no-fission:
                by-test-platform:
@ -361,9 +361,9 @@ web-platform-tests-print-reftest:
            webrender-sw:
                by-test-platform:
                    android.*: []
-                    .*-32.*/.*: []
+                    (linux1804|windows10)-32.*/.*: []
                    linux.*64-qr/debug: built-projects
-                    windows.*-qr/debug: built-projects
+                    windows10-64-2004-qr/debug: built-projects
                    default: []
            webrender-sw+no-fission:
                by-test-platform:
--- a/taskcluster/ci/test/xpcshell.yml
+++ b/taskcluster/ci/test/xpcshell.yml
@ -12,11 +12,11 @@ job-defaults:
    target:
        by-test-platform:
            android-em-7.*: geckoview-test_runner.apk
-            windows1.*-shippable-qr/opt:
+            windows10-64-2004-shippable-qr/opt:
                by-variant:
                    msix: target.installer.msix
                    default: null
-            windows1.*-qr/opt:
+            windows10-64-2004-qr/opt:
                by-variant:
                    msix: target.installer.msix
                    default: null
@ -41,8 +41,11 @@ job-defaults:
        requires-signed-builds:
            by-test-platform:
                macosx1100.*: true
-                windows.*-asan-qr/opt: false    # No XPCShell on ASAN yet
-                windows.*-mingwclang-qr/.*: false
+                windows10-64-2004-asan-qr/opt: false    # No XPCShell on ASAN yet
+                windows10-32-mingwclang-qr/opt: false
+                windows10-32-mingwclang-qr/debug: false
+                windows10-64-2004-mingwclang-qr/opt: false
+                windows10-64-2004-mingwclang-qr/debug: false
                windows.*: true
                default: false

@ -59,9 +62,7 @@ xpcshell:
        by-variant:
            conditioned_profile:
                by-test-platform:
-                    .*asan.*: []
-                    .*ccov.*: []
-                    (linux1804-64|windows1.*64.*)(-shippable)?-qr/opt: ['trunk']
+                    (linux1804-64|windows10-64-2004)(-shippable)?-qr/opt: ['trunk']
                    default: []
            socketprocess_networking+no-fission:
                by-test-platform:
@ -80,13 +81,13 @@ xpcshell:
                    default: []
            msix:
                by-test-platform:
-                    windows1.*-shippable-qr/opt: built-projects
-                    windows1.*-qr/opt: built-projects
+                    windows10-64-2004-shippable-qr/opt: built-projects
+                    windows10-64-2004-qr/opt: built-projects
                    default: []
            default:
                by-test-platform:
                    android.*: []
-                    windows.*-asan-qr/opt: []  # No XPCShell on ASAN yet
+                    windows10-64-2004-asan-qr/opt: []  # No XPCShell on ASAN yet
                    default: built-projects
    chunks:
        by-test-platform:
@ -100,19 +101,20 @@ xpcshell:
            msix: 7200
            default:
                by-test-platform:
-                    .*-ccov(-qr)?/.*: 7200
+                    .*64-ccov(-qr)?/.*: 7200
+                    .*64-2004-ccov(-qr)?/.*: 7200  # Windows 10 x64 2004 CCov specific, the line above does not catch this case.
                    .*-tsan-qr/opt: 7200
                    default: 5400
    allow-software-gl-layers: false
    tier:
        by-test-platform:
-            windows.*-asan.*: 3
+            windows10-64-2004-asan.*: 3
            android-em-7.0-x86_64-qr/debug-isolated-process: 3
            default: default
    mozharness:
        extra-options:
            by-test-platform:
-                windows1.*:
+                windows10.*:
                    - --threads=2
                default: []
    fetches:
@ -157,12 +159,12 @@ xpcshell-failures:
        script:
            by-test-platform:
                macos.*: mac_unittest.py
-                windows1.*: desktop_unittest.py
+                windows10.*: desktop_unittest.py
        config:
            by-test-platform:
                macos.*:
                    - unittests/mac_unittest.py
-                windows1.*:
+                windows10.*:
                    - unittests/win_unittest.py
        extra-options:
            by-test-platform:
@ -170,6 +172,10 @@ xpcshell-failures:
                    - --run-failures=apple_silicon
                    - --timeout-as-pass
                    - --crash-as-pass
+                windows10-32-2004.*:
+                    - --run-failures=win10_2004
+                    - --timeout-as-pass
+                    - --crash-as-pass
    fetches:
        toolchain:
            by-test-platform:
--- a/taskcluster/gecko_taskgraph/transforms/test/worker.py
+++ b/taskcluster/gecko_taskgraph/transforms/test/worker.py
@ -145,58 +145,6 @@ WINDOWS_WORKER_TYPES = {
        "virtual": "win10-64-2004",
        "virtual-with-gpu": "win10-64-2004-gpu",
    },
-    "windows11-32-2009-mingwclang-qr": {
-        "virtual": "win11-64-2009",
-        "virtual-with-gpu": "win11-64-2009-gpu",
-    },
-    "windows11-32-2009-qr": {
-        "virtual": "win11-64-2009",
-        "virtual-with-gpu": "win11-64-2009-gpu",
-    },
-    "windows11-32-2009-shippable-qr": {
-        "virtual": "win11-64-2009",
-        "virtual-with-gpu": "win11-64-2009-gpu",
-    },
-    "windows11-64-2009": {
-        "virtual": "win11-64-2009",
-        "virtual-with-gpu": "win11-64-2009-gpu",
-    },
-    "windows11-64-2009-ccov": {
-        "virtual": "win11-64-2009-ssd",
-        "virtual-with-gpu": "win11-64-2009-ssd-gpu",
-    },
-    "windows11-64-2009-ccov-qr": {
-        "virtual": "win11-64-2009-ssd",
-        "virtual-with-gpu": "win11-64-2009-ssd-gpu",
-    },
-    "windows11-64-2009-devedition": {
-        "virtual": "win11-64-2009",
-        "virtual-with-gpu": "win11-64-2009-gpu",
-    },
-    "windows11-64-2009-shippable": {
-        "virtual": "win11-64-2009",
-        "virtual-with-gpu": "win11-64-2009-gpu",
-    },
-    "windows11-64-2009-qr": {
-        "virtual": "win11-64-2009",
-        "virtual-with-gpu": "win11-64-2009-gpu",
-    },
-    "windows11-64-2009-shippable-qr": {
-        "virtual": "win11-64-2009",
-        "virtual-with-gpu": "win11-64-2009-gpu",
-    },
-    "windows11-64-2009-devedition-qr": {
-        "virtual": "win11-64-2009",
-        "virtual-with-gpu": "win11-64-2009-gpu",
-    },
-    "windows11-64-2009-asan-qr": {
-        "virtual": "win11-64-2009",
-        "virtual-with-gpu": "win11-64-2009-gpu",
-    },
-    "windows11-64-2009-mingwclang-qr": {
-        "virtual": "win11-64-2009",
-        "virtual-with-gpu": "win11-64-2009-gpu",
-    },
 }

 # os x worker types keyed by test-platform
@ -248,7 +196,7 @@ def set_worker_type(config, tasks):
                ]
                if task[
                    "virtualization"
-                ] == "virtual-with-gpu" and test_platform.startswith("windows1"):
+                ] == "virtual-with-gpu" and test_platform.startswith("windows10"):
                    # add in `--requires-gpu` to the mozharness options
                    task["mozharness"]["extra-options"].append("--requires-gpu")

--- a/testing/perfdocs/generated/awsy.rst
+++ b/testing/perfdocs/generated/awsy.rst
@ -52,22 +52,6 @@ Awsy tests
            * awsy-base: integration, mozilla-beta, mozilla-central, mozilla-release
            * awsy-base-dmd: None

-      * test-windows11-32-2009-qr/opt
-            * awsy-base: None
-            * awsy-base-dmd: None
-
-      * test-windows11-32-2009-shippable-qr/opt
-            * awsy-base: None
-            * awsy-base-dmd: None
-
-      * test-windows11-64-2009-qr/opt
-            * awsy-base: None
-            * awsy-base-dmd: None
-
-      * test-windows11-64-2009-shippable-qr/opt
-            * awsy-base: integration, mozilla-beta, mozilla-central, mozilla-release
-            * awsy-base-dmd: None
-

 .. dropdown:: dmd (FF)
   :container: + anchor-id-dmd-Awsy-tests
@ -107,22 +91,6 @@ Awsy tests
            * awsy-base-dmd: None
            * awsy-dmd: None

-      * test-windows11-32-2009-qr/opt
-            * awsy-base-dmd: None
-            * awsy-dmd: None
-
-      * test-windows11-32-2009-shippable-qr/opt
-            * awsy-base-dmd: None
-            * awsy-dmd: None
-
-      * test-windows11-64-2009-qr/opt
-            * awsy-base-dmd: None
-            * awsy-dmd: None
-
-      * test-windows11-64-2009-shippable-qr/opt
-            * awsy-base-dmd: None
-            * awsy-dmd: None
-

 .. dropdown:: tp5 (FF)
   :container: + anchor-id-tp5-Awsy-tests
@ -146,14 +114,6 @@ Awsy tests

      * test-windows10-64-2004-shippable-qr/opt

-      * test-windows11-32-2009-qr/opt
-
-      * test-windows11-32-2009-shippable-qr/opt
-
-      * test-windows11-64-2009-qr/opt
-
-      * test-windows11-64-2009-shippable-qr/opt
-

 .. dropdown:: tp6 (FF)
   :container: + anchor-id-tp6-Awsy-tests
@ -185,18 +145,6 @@ Awsy tests
      * test-windows10-64-2004-shippable-qr/opt
            * awsy-tp6: integration, mozilla-beta, mozilla-central, mozilla-release

-      * test-windows11-32-2009-qr/opt
-            * awsy-tp6: None
-
-      * test-windows11-32-2009-shippable-qr/opt
-            * awsy-tp6: None
-
-      * test-windows11-64-2009-qr/opt
-            * awsy-tp6: None
-
-      * test-windows11-64-2009-shippable-qr/opt
-            * awsy-tp6: integration, mozilla-beta, mozilla-central, mozilla-release
-



--- a/testing/perfdocs/generated/talos.rst
+++ b/testing/perfdocs/generated/talos.rst
@ -6357,48 +6357,6 @@ For the sample commands found below, note that the capitalization used is import
        - ✅


-   .. list-table:: **test-windows11-64-2009-qr/opt**
-      :widths: 30 15 15 15 15
-      :header-rows: 1
-
-      * - **Test Name**
-        - mozilla-central
-        - autoland
-        - mozilla-release
-        - mozilla-beta
-      * - **talos-xperf**
-        - ❌
-        - ❌
-        - ❌
-        - ❌
-      * - **talos-xperf-swr**
-        - ❌
-        - ❌
-        - ❌
-        - ❌
-
-
-   .. list-table:: **test-windows11-64-2009-shippable-qr/opt**
-      :widths: 30 15 15 15 15
-      :header-rows: 1
-
-      * - **Test Name**
-        - mozilla-central
-        - autoland
-        - mozilla-release
-        - mozilla-beta
-      * - **talos-xperf**
-        - ✅
-        - ✅
-        - ❌
-        - ✅
-      * - **talos-xperf-swr**
-        - ✅
-        - ✅
-        - ❌
-        - ✅
-
-

 .. dropdown:: tp5o
   :container: + anchor-id-tp5o