diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index 523614c862..81582da0a9 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl @@ -290,13 +290,6 @@ 'args': ['--xctest'] } }, - 'win10': { - 'swarming': { - 'dimensions': { - 'os': 'Windows-10-19042|Windows-10-19045' - } - } - }, 'win10-any': { 'swarming': { 'dimensions': { @@ -304,6 +297,13 @@ } } }, + 'win10-override': { + 'swarming': { + 'dimensions': { + 'os': 'Windows-10-19042|Windows-10-19045' + } + } + }, 'x86-64': { 'swarming': { 'dimensions': { diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl index 086edd3a9f..4af7b551b0 100644 --- a/infra/specs/mixins_webrtc.pyl +++ b/infra/specs/mixins_webrtc.pyl @@ -199,6 +199,13 @@ ], }, }, + 'win10-override': { + 'swarming': { + 'dimensions': { + 'os': 'Windows-10-19042|Windows-10-19045' + } + } + }, 'xcode_13_main': { '$mixin_append': { 'args': ['--xcode-build-version', '13c100'] diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index 33e92a4452..ad2265d8aa 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -189,7 +189,7 @@ 'MacArm64 Builder': {}, 'Win (more configs)': { 'os_type': 'win', - 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'more_configs_tests', }, @@ -198,21 +198,21 @@ 'Win32 Debug (Clang)': {}, 'Win32 Release (Clang)': { 'os_type': 'win', - 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, }, 'Win64 ASan': { 'os_type': 'win', - 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, }, 'Win64 Debug (Clang)': { 'os_type': 'win', - 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, @@ -594,7 +594,7 @@ }, 'win_asan': { 'os_type': 'win', - 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, @@ -605,35 +605,35 @@ 'win_compile_x86_clang_rel': {}, 'win_x64_clang_dbg': { 'os_type': 'win', - 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, }, 'win_x64_clang_rel': { 'os_type': 'win', - 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, }, 'win_x86_clang_dbg': { 'os_type': 'win', - 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, }, 'win_x86_clang_rel': { 'os_type': 'win', - 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests_tryserver', }, }, 'win_x86_more_configs': { 'os_type': 'win', - 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'more_configs_tests', },