commit 87733493da8ee199d267c5e027fe68745e5bfdfa
author Jeremy Leconte <jleconte@google.com> Wed Jan 25 10:32:59 2023
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jan 25 12:22:45 2023
tree ecb62f71085458d1327a4c2ac7012d7654dbebb0
parent 92dcc2d1f4c72e2c9e3eef55e73e5937028d5eb9

Update win10 mixins.

Change-Id: If035642c71d88a5be4b444d61364966e67c038ce
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/291331
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Reviewed-by: Andrey Logvin <landrey@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39192}

infra/specs/mixins.pyl

diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl
index 523614c..81582da 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': {

infra/specs/mixins_webrtc.pyl

diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl
index 086edd3..4af7b55 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']

infra/specs/waterfalls.pyl

diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index 33e92a4..ad2265d 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',
         },