From 5f246cb2bf3a867ea8abd5dbe07632ef57889b4b Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Mon, 13 Feb 2023 13:22:32 +0100 Subject: [PATCH] Use win10 chromium mixins now that win bots are upgraded. Change-Id: I03f9af65deb4bd11bb942639009936f883ef47fc Bug: None Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/293220 Reviewed-by: Christoffer Jansson Commit-Queue: Jeremy Leconte Cr-Commit-Position: refs/heads/main@{#39301} --- infra/specs/client.webrtc.json | 164 ++++++++++++------------ infra/specs/mixins.pyl | 14 +- infra/specs/mixins_webrtc.pyl | 7 - infra/specs/tryserver.webrtc.json | 206 +++++++++++++++--------------- infra/specs/waterfalls.pyl | 22 ++-- 5 files changed, 203 insertions(+), 210 deletions(-) diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json index bb7f62e6f9..e75777ad2a 100644 --- a/infra/specs/client.webrtc.json +++ b/infra/specs/client.webrtc.json @@ -8279,7 +8279,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -8307,7 +8307,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8328,7 +8328,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8349,7 +8349,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8370,7 +8370,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8394,7 +8394,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8415,7 +8415,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 2 @@ -8437,7 +8437,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 6 @@ -8459,7 +8459,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -8481,7 +8481,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8502,7 +8502,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8523,7 +8523,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8544,7 +8544,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 6 @@ -8566,7 +8566,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8587,7 +8587,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -8609,7 +8609,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8630,7 +8630,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8651,7 +8651,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8672,7 +8672,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -8694,7 +8694,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8715,7 +8715,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8740,7 +8740,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8761,7 +8761,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8782,7 +8782,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8803,7 +8803,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8827,7 +8827,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8848,7 +8848,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 2 @@ -8870,7 +8870,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 6 @@ -8892,7 +8892,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -8914,7 +8914,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8935,7 +8935,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8956,7 +8956,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -8977,7 +8977,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 6 @@ -8999,7 +8999,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9020,7 +9020,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -9042,7 +9042,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9063,7 +9063,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9084,7 +9084,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9105,7 +9105,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -9127,7 +9127,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9148,7 +9148,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9173,7 +9173,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9194,7 +9194,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9215,7 +9215,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9236,7 +9236,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9260,7 +9260,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9281,7 +9281,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 2 @@ -9303,7 +9303,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 6 @@ -9325,7 +9325,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -9347,7 +9347,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9368,7 +9368,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9389,7 +9389,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9410,7 +9410,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 6 @@ -9432,7 +9432,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9453,7 +9453,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -9475,7 +9475,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9496,7 +9496,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9517,7 +9517,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9538,7 +9538,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -9560,7 +9560,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9581,7 +9581,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -9606,7 +9606,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ] }, @@ -9627,7 +9627,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ] }, @@ -9648,7 +9648,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ] }, @@ -9669,7 +9669,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ] }, @@ -9693,7 +9693,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ] }, @@ -9714,7 +9714,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ], "shards": 2 @@ -9736,7 +9736,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ], "shards": 6 @@ -9758,7 +9758,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ], "shards": 4 @@ -9780,7 +9780,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ] }, @@ -9801,7 +9801,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ] }, @@ -9822,7 +9822,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ] }, @@ -9843,7 +9843,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ], "shards": 6 @@ -9865,7 +9865,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ] }, @@ -9886,7 +9886,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ], "shards": 4 @@ -9908,7 +9908,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ] }, @@ -9929,7 +9929,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ] }, @@ -9950,7 +9950,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ] }, @@ -9971,7 +9971,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10", + "os": "Windows-10-19045", "pool": "WebRTC-baremetal" } ] @@ -9993,7 +9993,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ], "shards": 4 @@ -10015,7 +10015,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ] }, @@ -10036,7 +10036,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10" + "os": "Windows-10-19045" } ] }, diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index b25a1fd679..f46c487426 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl @@ -302,6 +302,13 @@ 'args': ['--xctest'] } }, + 'win10': { + 'swarming': { + 'dimensions': { + 'os': 'Windows-10-19045' + } + } + }, 'win10-any': { 'swarming': { 'dimensions': { @@ -309,13 +316,6 @@ } } }, - '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 8bc6f0c782..238c69d44e 100644 --- a/infra/specs/mixins_webrtc.pyl +++ b/infra/specs/mixins_webrtc.pyl @@ -207,13 +207,6 @@ ], }, }, - '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/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json index 20fe7767ae..285bafb4d5 100644 --- a/infra/specs/tryserver.webrtc.json +++ b/infra/specs/tryserver.webrtc.json @@ -13169,7 +13169,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13190,7 +13190,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13211,7 +13211,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13232,7 +13232,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13256,7 +13256,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13277,7 +13277,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 2 @@ -13299,7 +13299,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 6 @@ -13321,7 +13321,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -13343,7 +13343,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13364,7 +13364,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13385,7 +13385,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13406,7 +13406,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 6 @@ -13428,7 +13428,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13449,7 +13449,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -13471,7 +13471,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13492,7 +13492,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13513,7 +13513,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13534,7 +13534,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -13556,7 +13556,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13577,7 +13577,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13606,7 +13606,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13627,7 +13627,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13648,7 +13648,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13669,7 +13669,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13693,7 +13693,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13714,7 +13714,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 2 @@ -13736,7 +13736,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 6 @@ -13758,7 +13758,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -13780,7 +13780,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13801,7 +13801,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13822,7 +13822,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13843,7 +13843,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 6 @@ -13865,7 +13865,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13886,7 +13886,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -13908,7 +13908,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13929,7 +13929,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13950,7 +13950,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -13971,7 +13971,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -13993,7 +13993,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14014,7 +14014,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14039,7 +14039,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14060,7 +14060,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14081,7 +14081,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14102,7 +14102,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14126,7 +14126,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14147,7 +14147,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 2 @@ -14169,7 +14169,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 6 @@ -14191,7 +14191,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -14213,7 +14213,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14234,7 +14234,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14255,7 +14255,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14276,7 +14276,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 6 @@ -14298,7 +14298,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14319,7 +14319,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -14341,7 +14341,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14362,7 +14362,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14383,7 +14383,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14404,7 +14404,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -14426,7 +14426,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14447,7 +14447,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14472,7 +14472,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14493,7 +14493,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14514,7 +14514,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14535,7 +14535,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14559,7 +14559,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14580,7 +14580,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 2 @@ -14602,7 +14602,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 6 @@ -14624,7 +14624,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -14646,7 +14646,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14667,7 +14667,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14688,7 +14688,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14709,7 +14709,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 6 @@ -14731,7 +14731,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14752,7 +14752,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -14774,7 +14774,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14795,7 +14795,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14816,7 +14816,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14837,7 +14837,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -14859,7 +14859,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14880,7 +14880,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14905,7 +14905,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14926,7 +14926,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14947,7 +14947,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14968,7 +14968,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -14992,7 +14992,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -15013,7 +15013,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 2 @@ -15035,7 +15035,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 6 @@ -15057,7 +15057,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -15079,7 +15079,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -15100,7 +15100,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -15121,7 +15121,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -15142,7 +15142,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 6 @@ -15164,7 +15164,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -15185,7 +15185,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -15207,7 +15207,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -15228,7 +15228,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -15249,7 +15249,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -15270,7 +15270,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045", + "os": "Windows-10-19045", "pool": "WebRTC-baremetal-try" } ] @@ -15292,7 +15292,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 @@ -15314,7 +15314,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -15335,7 +15335,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -15362,7 +15362,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ] }, @@ -15387,7 +15387,7 @@ "dimension_sets": [ { "cpu": "x86-64", - "os": "Windows-10-19042|Windows-10-19045" + "os": "Windows-10-19045" } ], "shards": 4 diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index 2cd477d432..78caceb25f 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -193,7 +193,7 @@ 'MacArm64 Builder': {}, 'Win (more configs)': { 'os_type': 'win', - 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'more_configs_tests', }, @@ -202,28 +202,28 @@ 'Win32 Debug (Clang)': {}, 'Win32 Release (Clang)': { 'os_type': 'win', - 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, }, 'Win64 ASan': { 'os_type': 'win', - 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, }, 'Win64 Debug (Clang)': { 'os_type': 'win', - 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, }, 'Win64 Release (Clang)': { 'os_type': 'win', - 'mixins': ['win10-any', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests_with_video_capture', }, @@ -602,7 +602,7 @@ }, 'win_asan': { 'os_type': 'win', - 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, @@ -613,35 +613,35 @@ 'win_compile_x86_clang_rel': {}, 'win_x64_clang_dbg': { 'os_type': 'win', - 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, }, 'win_x64_clang_rel': { 'os_type': 'win', - 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, }, 'win_x86_clang_dbg': { 'os_type': 'win', - 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests', }, }, 'win_x86_clang_rel': { 'os_type': 'win', - 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'desktop_tests_tryserver', }, }, 'win_x86_more_configs': { 'os_type': 'win', - 'mixins': ['win10-override', 'x86-64', 'resultdb-json-format'], + 'mixins': ['win10', 'x86-64', 'resultdb-json-format'], 'test_suites': { 'isolated_scripts': 'more_configs_tests', },