Bug 1717825 - Move Windows 10 64-bit tests to WebRender only. r=jmaher,perftest-reviewers,Bebe

Differential Revision: https://phabricator.services.mozilla.com/D118592

dom/canvas/test/chrome/chrome.ini

@@ -7,5 +7,5 @@ skip-if =
   os == 'android'
   os == 'linux' && swgl  # Bug 1693807
   os == 'win' && ccov # Bug 1705410
-  os == 'win' && (bits == 32 || asan) && webrender
+  os == 'win' && webrender # Bug 1717900
 support-files = ../file_drawWindow_source.html ../file_drawWindow_common.js

taskcluster/ci/config.yml

@@ -17,6 +17,7 @@ treeherder:
         'Btime': 'Browsertime performance tests on Firefox'
         'Btime-1proc': 'Browsertime performance tests on Firefox without e10s'
         'Btime-fis': 'Browsertime performance tests on Firefox with fission enabled'
+        'Btime-noqr': 'Browsertime performance tests with no webrender or software webrender'
         'Btime-Prof': 'Browsertime performance tests on Firefox with Gecko Profiling'
         'Btime-Prof-fis': 'Browsertime performance tests on Firefox with Gecko Profiling, fission enabled'
         'Btime-Prof-1proc': 'Browsertime performance tests on Firefox with Gecko Profiling and without e10s'

taskcluster/ci/test/browsertime-desktop.yml

@@ -16,9 +16,9 @@ job-defaults:
     limit-platforms:
         by-app:
             chrome:
-                - .*shippable(?!-qr).*
+                - .*shippable.*
             chromium:
-                - .*shippable(?!-qr).*
+                - .*shippable.*
             default: []
     test-manifest-loader: null  # don't load tests in the taskgraph
     tier: 3
@@ -52,9 +52,9 @@ browsertime-tp6:
         limit-platforms:
             by-app:
                 chrome:
-                    - .*shippable(?!-qr).*
+                    - .*shippable.*
                 chromium:
-                    - .*shippable(?!-qr).*
+                    - .*shippable.*
                 default: []
         max-run-time: 4000
         mozharness:
@@ -150,6 +150,14 @@ browsertime-tp6-essential:
                             macosx1100.*shippable.*: [mozilla-central, mozilla-beta]
                             default: []
                     default: []
+    variants:
+        by-app:
+            firefox:
+                by-test-platform:
+                    windows10-64.*shippable-qr/.*: [fission, noqr]
+                    (?!windows10-64).*shippable-qr/.*: [fission]
+                    default: []
+            default: []
     tier:
         by-test-platform:
             linux1804-64-clang-trunk/opt: 2
@@ -187,7 +195,6 @@ browsertime-benchmark:
                             unity-webgl: 3
                             default:
                                 by-test-platform:
-                                    windows10-64-ref-hw-2017/opt: 2
                                     windows10-64-ccov.*/.*: 3
                                     linux64-ccov.*/.*: 3
                                     default: 2

taskcluster/ci/test/mochitest.yml

@@ -172,14 +172,10 @@ mochitest-browser-chrome:
     max-run-time:
         by-test-platform:
             linux.*64-ccov.*/.*: 9000
-            windows7-32-qr/debug: 5400
-            windows10-64/debug: 5400
-            macosx.*64(-qr)?/debug: 5400
             windows10-64-ccov.*/.*: 10800
             macosx.*64-ccov.*/.*: 10800
-            linux.*/debug: 5400
-            windows10-64-qr/debug: 5400
             linux.*64-tsan/opt: 9000
+            .*/debug: 5400
             default: 3600
     mozharness:
         mochitest-flavor: browser
@@ -726,7 +722,7 @@ mochitest-webgl2-ext:
             android.*: []
             linux.*64-qr/debug: ['fission', 'fission-webgl-ipc', 'webrender-sw', 'webgl-ipc', 'wayland']
             linux.*64(-shippable)?-(qr|asan)?/opt: ['fission', 'fission-webgl-ipc', 'webgl-ipc', 'wayland']
-            windows10-64(-shippable)?/(opt|debug): ['fission', 'fission-webgl-ipc', 'webgl-ipc']
+            windows10-64(-shippable)?-qr/(opt|debug): ['fission', 'fission-webgl-ipc', 'webgl-ipc']
             default: ['webgl-ipc']
     chunks: 4
     e10s: true

taskcluster/ci/test/test-platforms.yml

@@ -221,17 +221,40 @@ windows10-64-ccov-qr/opt:
         - windows10-tests
         - web-platform-tests
         - ccov-code-coverage-tests
+        - mochitest-devtools-chrome
         - mochitest-webgpu
 
 windows10-64/debug:
+    build-platform: win64/debug
+    test-sets:
+        - mochitest-devtools-chrome
+
+windows10-64/opt:
+    build-platform: win64/opt
+    test-sets:
+        - mochitest-devtools-chrome
+        - xpcshell
+
+windows10-64-shippable/opt:
+    build-platform: win64-shippable/opt
+    test-sets:
+        - mochitest-devtools-chrome
+
+windows10-64-devedition/opt:
+    build-platform: win64-devedition/opt
+    test-sets:
+        - mochitest-devtools-chrome
+
+windows10-64-qr/debug:
     build-platform: win64/debug
     test-sets:
         - mochitest-webgpu
         - windows-tests
         - windows10-tests
         - web-platform-tests
+        - web-platform-tests-wdspec-headless
 
-windows10-64/opt:
+windows10-64-qr/opt:
     build-platform: win64/opt
     test-sets:
         - awsy
@@ -258,7 +281,7 @@ windows10-64-ref-hw-2017/opt:
         - browsertime
         - talos-ref-hw
 
-windows10-64-shippable/opt:
+windows10-64-shippable-qr/opt:
     build-platform: win64-shippable/opt
     test-sets:
         - awsy
@@ -274,7 +297,7 @@ windows10-64-shippable/opt:
         - browsertime
         - mochitest-webgpu
 
-windows10-64-devedition/opt:
+windows10-64-devedition-qr/opt:
     build-platform: win64-devedition/opt
     test-sets:
         - desktop-screenshot-capture
@@ -289,38 +312,7 @@ windows10-64-asan-qr/opt:
         - windows-tests
         - windows10-tests
         - mochitest-webgpu
-
-# QR builds just run a subset right now.
-windows10-64-qr/debug:
-    build-platform: win64/debug
-    test-sets:
-        - mochitest-webgpu
-        - windows-qr-tests
-        - web-platform-tests
-        - web-platform-tests-wdspec-headless
-
-windows10-64-qr/opt:
-    build-platform: win64/opt
-    test-sets:
-        - awsy
-        - windows-qr-tests
-        - windows-talos
-        - raptor-firefox
-        - browsertime
-        - web-platform-tests
-
-windows10-64-shippable-qr/opt:
-    build-platform: win64-shippable/opt
-    test-sets:
-        - awsy
-        - windows-qr-tests
-        - windows-talos
-        - talos-profiling
-        - raptor-firefox
-        - browsertime
-        - browsertime-profiling
-        - web-platform-tests
-        - mochitest-webgpu
+        - mochitest-devtools-chrome
 
 windows10-64-mingwclang-qr/debug:
     build-platform: win64-mingwclang/debug

taskcluster/ci/test/test-sets.yml

@@ -29,9 +29,15 @@ web-platform-tests-backlog:
 web-platform-tests-wdspec-headless:
     - web-platform-tests-wdspec-headless
 
+mochitest-devtools-chrome:
+    - mochitest-devtools-chrome
+
 mochitest-webgpu:
     - mochitest-webgpu
 
+xpcshell:
+    - xpcshell
+
 talos:
     - talos-bcv
     - talos-chrome
@@ -326,7 +332,6 @@ windows10-tests:
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
     - mochitest-webgl2-ext
-    - mochitest-devtools-chrome
 
 mingwclang-tests-debug:
     - cppunit

taskcluster/taskgraph/transforms/tests.py

@@ -139,6 +139,11 @@ WINDOWS_WORKER_TYPES = {
         "virtual-with-gpu": "t-win10-64-gpu-s",
         "hardware": "t-win10-64-1803-hw",
     },
+    "windows10-64-devedition-qr": {
+        "virtual": "t-win10-64",
+        "virtual-with-gpu": "t-win10-64-gpu-s",
+        "hardware": "t-win10-64-1803-hw",
+    },
     "windows10-64-asan-qr": {
         "virtual": "t-win10-64",
         "virtual-with-gpu": "t-win10-64-gpu-s",
@@ -1420,6 +1425,7 @@ def handle_tier(config, tasks):
                 "windows10-64-qr/opt",
                 "windows10-64-qr/debug",
                 "windows10-64-shippable-qr/opt",
+                "windows10-64-devedition-qr/opt",
                 "windows10-64-asan-qr/opt",
                 "macosx1014-64/opt",
                 "macosx1014-64/debug",

testing/raptor/raptor/cmdline.py

@@ -513,7 +513,7 @@ def verify_options(parser, args):
                 "refbrow",
                 "fenix",
             ]
-            and platform.system().lower() not in ("darwin",)
+            and platform.system().lower() not in ["darwin", "windows"]
         ):
             parser.error(
                 "WebRender is only supported when running Raptor on Firefox Desktop "