Add a win10-any mixins that don't specify the version.

This is to fix "Win32 Release (Clang)" and "Perf Win7" bots that cannot find resources.

Change-Id: I0db4719d508b70c78f4357b28a69d3d711ca9be3
Bug: webrtc:14384
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/272362
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Reviewed-by: Christoffer Jansson <jansson@google.com>
Reviewed-by: Christoffer Jansson <jansson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37832}
This commit is contained in:
Jeremy Leconte 2022-08-19 08:48:57 +02:00 committed by WebRTC LUCI CQ
parent 1d5be49ff2
commit df4dc3ca6b
5 changed files with 39 additions and 25 deletions

View File

@ -8464,7 +8464,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
]
},
@ -8485,7 +8485,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
]
},
@ -8506,7 +8506,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
]
},
@ -8527,7 +8527,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
]
},
@ -8551,7 +8551,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
]
},
@ -8572,7 +8572,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
],
"shards": 2
@ -8594,7 +8594,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
],
"shards": 6
@ -8616,7 +8616,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
],
"shards": 4
@ -8638,7 +8638,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
]
},
@ -8659,7 +8659,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
]
},
@ -8680,7 +8680,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
]
},
@ -8701,7 +8701,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
],
"shards": 6
@ -8723,7 +8723,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
]
},
@ -8744,7 +8744,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
]
},
@ -8765,7 +8765,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
]
},
@ -8786,7 +8786,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
]
},
@ -8807,7 +8807,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
]
},
@ -8828,7 +8828,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042",
"os": "Windows-10",
"pool": "WebRTC-baremetal"
}
]
@ -8850,7 +8850,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
],
"shards": 4
@ -8872,7 +8872,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
]
},
@ -8893,7 +8893,7 @@
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-19042"
"os": "Windows-10"
}
]
},

View File

@ -509,7 +509,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Windows-10-19042",
"os": "Windows-10",
"pool": "WebRTC-perf"
}
],
@ -543,7 +543,7 @@
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Windows-10-19042",
"os": "Windows-10",
"pool": "WebRTC-perf"
}
],

View File

@ -309,6 +309,13 @@
}
}
},
'win10-any': {
'swarming': {
'dimensions': {
'os': 'Windows-10'
}
}
},
'x86-64': {
'swarming': {
'dimensions': {

View File

@ -232,6 +232,13 @@
],
},
},
'win10-any': {
'swarming': {
'dimensions': {
'os': 'Windows-10'
}
}
},
'xcode_13_main': {
'$mixin_append': {
'args': ['--xcode-build-version', '13c100']

View File

@ -184,7 +184,7 @@
'Win32 Debug (Clang)': {},
'Win32 Release (Clang)': {
'os_type': 'win',
'mixins': ['win10', 'x86-64', 'resultdb-json-format'],
'mixins': ['win10-any', 'x86-64', 'resultdb-json-format'],
'test_suites': {
'isolated_scripts': 'desktop_tests_with_video_capture',
},
@ -309,7 +309,7 @@
'os_type':
'win',
'mixins':
['win10', 'perf-pool', 'timeout-3h', 'resultdb-gtest-json-format'],
['win10-any', 'perf-pool', 'timeout-3h', 'resultdb-gtest-json-format'],
'test_suites': {
'isolated_scripts': 'desktop_perf_tests',
},