From fd4d7d261e52577716e074771a1e8b7bb3d5e92b Mon Sep 17 00:00:00 2001
From: Corentin Wallez <cwallez@chromium.org>
Date: Tue, 12 Jan 2021 15:32:48 +0000
Subject: [PATCH] cr-buildbucket.cfg: Use Windows 10 only for CQ

Chromium's //build directory now supports building only on Windows 10,
so request that for our builder.

Bug: None

Change-Id: I10692e20e25d8ea305a6504fb17cf5ac9370b6fc
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/37441
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
---
 infra/config/global/cr-buildbucket.cfg | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
index 65c64544a7..5e1c49d644 100644
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -85,7 +85,7 @@ builder_mixins {
 }
 builder_mixins {
   name: "windows",
-  dimensions: "os:Windows"
+  dimensions: "os:Windows-10"
   recipe {
     properties_j: <<EOF
       $build/goma: {
@@ -204,17 +204,17 @@ buckets {
       mixins: "x86"
     }
     # GOMA doesn't support MSVC builds so we don't used the "windows" mixin and
-    # instead list the dimensions: "os:Windows" directly.
+    # instead list the dimensions: "os:Windows-10" directly.
     builders {
       name: "win-msvc-dbg-x64"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       mixins: "no_clang"
       mixins: "debug"
       mixins: "x64"
     }
     builders {
       name: "win-msvc-rel-x64"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       mixins: "no_clang"
       mixins: "release"
       mixins: "x64"
@@ -335,11 +335,11 @@ buckets: {
       mixins: "x86"
     }
     # GOMA doesn't support MSVC builds so we don't used the "windows" mixin and
-    # instead list the dimensions: "os:Windows" directly.
+    # instead list the dimensions: "os:Windows-10" directly.
     # CI Mirror only
     builders {
       name: "win-msvc-dbg-x64"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       mixins: "no_clang"
       mixins: "debug"
       mixins: "x64"
@@ -347,7 +347,7 @@ buckets: {
     # CI Mirror only
     builders {
       name: "win-msvc-rel-x64"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       mixins: "no_clang"
       mixins: "release"
       mixins: "x64"