Bug 1669478 - Enable WebRender on most of the windows10-64 ccov tests. r=ahal,jrmuizel

This moves most of the windows ccov tests to run with WebRender enabled by
putting them in the windows10-64-ccov-qr test platform. (The -qr suffix causes
the taskgraph code to enable WebRender for these jobs).
The only one skipped is the marionette GPU test because it contains a test that
specifically requires WebRender disabled.

The existing non-regex config keys that referred to `windows10-64-ccov` also
get updated, and in a couple of places we need to add a new non-regex key to
disambiguate between two matching regex keys.

Differential Revision: https://phabricator.services.mozilla.com/D94769
This commit is contained in:
Kartikaya Gupta 2020-10-28 17:47:56 +00:00
parent fd8ca47744
commit edc1d48bfd
8 changed files with 18 additions and 6 deletions

View File

@ -80,7 +80,7 @@ jittest:
chunks: chunks:
by-test-platform: by-test-platform:
windows.*: 1 windows.*: 1
windows10-64-ccov/opt: 8 windows10-64-ccov-qr/opt: 8
macosx.*/opt: 1 macosx.*/opt: 1
macosx.*/debug: 3 macosx.*/debug: 3
android.*: 10 android.*: 10

View File

@ -186,6 +186,7 @@ mochitest-chrome:
by-test-platform: by-test-platform:
.*-ccov.*/.*: 3 .*-ccov.*/.*: 3
.*-qr/.*: 3 .*-qr/.*: 3
windows10-64-ccov-qr/opt: 3
.*-asan/opt: 3 .*-asan/opt: 3
.*-tsan/opt: 6 .*-tsan/opt: 6
(linux.*64|windows.*-..|macosx10..)/debug: 3 (linux.*64|windows.*-..|macosx10..)/debug: 3

View File

@ -94,7 +94,7 @@ jsreftest:
android-hw.*/(opt|pgo)?: 6 android-hw.*/(opt|pgo)?: 6
windows.*\/opt: 2 windows.*\/opt: 2
windows10-64-asan/opt: 3 windows10-64-asan/opt: 3
windows10-64-ccov/opt: 5 windows10-64-ccov-qr/opt: 5
linux.*64-ccov.*/.*: 5 linux.*64-ccov.*/.*: 5
linux1804-64-qr/opt: 4 linux1804-64-qr/opt: 4
linux1804-64-qr/debug: 5 linux1804-64-qr/debug: 5
@ -140,7 +140,7 @@ reftest:
windows.*/opt: 2 windows.*/opt: 2
windows.*/debug: 4 windows.*/debug: 4
windows10-64-asan/opt: 3 windows10-64-asan/opt: 3
windows10-64-ccov/opt: 9 windows10-64-ccov-qr/opt: 9
default: 8 default: 8
e10s: true e10s: true
run-on-projects: run-on-projects:

View File

@ -24,7 +24,7 @@ job-defaults:
- talos/mac_config.py - talos/mac_config.py
windows.*: windows.*:
- talos/windows_config.py - talos/windows_config.py
windows10-64-ccov/opt: windows10-64-ccov-qr/opt:
- talos/windows_vm_config.py - talos/windows_vm_config.py
linux64-ccov.*/.*: linux64-ccov.*/.*:
- talos/linux64_config_taskcluster.py - talos/linux64_config_taskcluster.py
@ -556,6 +556,7 @@ talos-webgl:
.*-ccov.*/.*: [] .*-ccov.*/.*: []
android.*: [] android.*: []
(linux64|windows|macos).*-qr.*: ['webgl-ipc', 'webrender-sw'] (linux64|windows|macos).*-qr.*: ['webgl-ipc', 'webrender-sw']
windows10-64-ccov-qr/opt: []
default: ['webgl-ipc'] default: ['webgl-ipc']
run-on-projects: run-on-projects:
by-test-platform: by-test-platform:

View File

@ -224,13 +224,17 @@ windows7-32-qr/opt:
# win64 # win64
windows10-64-ccov/opt: windows10-64-ccov/opt:
build-platform: win64-ccov/opt
test-sets:
- marionette-gpu-tests # fails on -qr because one test requires WR disabled
windows10-64-ccov-qr/opt:
build-platform: win64-ccov/opt build-platform: win64-ccov/opt
test-sets: test-sets:
- awsy - awsy
- desktop-screenshot-capture - desktop-screenshot-capture
- windows-reftest-gpu - windows-reftest-gpu
- windows-talos - windows-talos
- marionette-gpu-tests
- windows-tests - windows-tests
- windows-ccov-tests - windows-ccov-tests
- windows10-tests - windows10-tests

View File

@ -117,7 +117,7 @@ web-platform-tests-reftest:
treeherder-symbol: W(Wr) treeherder-symbol: W(Wr)
virtualization: virtualization:
by-test-platform: by-test-platform:
windows10-64(?:-pgo|-shippable)?-qr/.*: virtual-with-gpu windows10-64.*-qr/.*: virtual-with-gpu
default: virtual default: virtual
chunks: chunks:
by-test-platform: by-test-platform:

View File

@ -50,6 +50,7 @@ xpcshell:
chunks: chunks:
by-test-platform: by-test-platform:
.*-ccov.*/.*: 6 .*-ccov.*/.*: 6
windows10-64-ccov-qr/opt: 6
android-em-7.*: 4 android-em-7.*: 4
macosx1014-64(-shippable|-devedition|-asan)?(-qr)?/.*: 2 macosx1014-64(-shippable|-devedition|-asan)?(-qr)?/.*: 2
linux1804-64(-qr)?/debug: 6 linux1804-64(-qr)?/debug: 6

View File

@ -109,6 +109,11 @@ WINDOWS_WORKER_TYPES = {
"virtual-with-gpu": "t-win10-64-gpu-s", "virtual-with-gpu": "t-win10-64-gpu-s",
"hardware": "t-win10-64-1803-hw", "hardware": "t-win10-64-1803-hw",
}, },
"windows10-64-ccov-qr": {
"virtual": "t-win10-64",
"virtual-with-gpu": "t-win10-64-gpu-s",
"hardware": "t-win10-64-1803-hw",
},
"windows10-64-devedition": { "windows10-64-devedition": {
"virtual": "t-win10-64", "virtual": "t-win10-64",
"virtual-with-gpu": "t-win10-64-gpu-s", "virtual-with-gpu": "t-win10-64-gpu-s",