From df4dc3ca6ba58218ba28c30544a89ff86c798b37 Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Fri, 19 Aug 2022 08:48:57 +0200 Subject: [PATCH] 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 Reviewed-by: Christoffer Jansson Reviewed-by: Christoffer Jansson Cr-Commit-Position: refs/heads/main@{#37832} --- infra/specs/client.webrtc.json | 42 ++++++++++++++--------------- infra/specs/client.webrtc.perf.json | 4 +-- infra/specs/mixins.pyl | 7 +++++ infra/specs/mixins_webrtc.pyl | 7 +++++ infra/specs/waterfalls.pyl | 4 +-- 5 files changed, 39 insertions(+), 25 deletions(-) diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json index 69440016de..3ebad4d5bd 100644 --- a/infra/specs/client.webrtc.json +++ b/infra/specs/client.webrtc.json @@ -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" } ] }, diff --git a/infra/specs/client.webrtc.perf.json b/infra/specs/client.webrtc.perf.json index a07c92bd79..68c9563178 100644 --- a/infra/specs/client.webrtc.perf.json +++ b/infra/specs/client.webrtc.perf.json @@ -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" } ], diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index 0c8ab4f7ad..b353b193d4 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl @@ -309,6 +309,13 @@ } } }, + 'win10-any': { + 'swarming': { + 'dimensions': { + 'os': 'Windows-10' + } + } + }, 'x86-64': { 'swarming': { 'dimensions': { diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl index d3d10d2e3e..a071832c66 100644 --- a/infra/specs/mixins_webrtc.pyl +++ b/infra/specs/mixins_webrtc.pyl @@ -232,6 +232,13 @@ ], }, }, + 'win10-any': { + 'swarming': { + 'dimensions': { + 'os': 'Windows-10' + } + } + }, 'xcode_13_main': { '$mixin_append': { 'args': ['--xcode-build-version', '13c100'] diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index 974662a741..ca999bd1f6 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -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', },