Temporarily specify machine_type for Win GCE bots.

Bug: skia:7409
Change-Id: Ic86696880858b9744bf9cea86caa3564c1a5e5af
Reviewed-on: https://skia-review.googlesource.com/85003
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

2 files changed, 44 insertions, 0 deletions

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index bdb94d58d1..a051800806 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -280,6 +280,10 @@ func defaultSwarmDimensions(parts map[string]string) []string {
 			if parts["model"] == "GCE" && d["os"] == DEFAULT_OS_DEBIAN {
 				d["os"] = DEFAULT_OS_LINUX_GCE
 			}
+			if parts["model"] == "GCE" && d["os"] == DEFAULT_OS_WIN {
+				// skia:7409
+				d["machine_type"] = "n1-standard-16"
+			}
 		} else {
 			if strings.Contains(parts["os"], "Win") {
 				gpu, ok := map[string]string{
@@ -356,6 +360,8 @@ func defaultSwarmDimensions(parts map[string]string) []string {
 		} else if d["os"] == DEFAULT_OS_WIN {
 			// Windows CPU bots.
 			d["cpu"] = "x86-64-Haswell_GCE"
+			// skia:7409
+			d["machine_type"] = "n1-standard-16"
 		} else if d["os"] == DEFAULT_OS_MAC {
 			// Mac CPU bots.
 			d["cpu"] = "x86-64-E5-2697_v2"
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index e55ef9c3b7..10ddce00aa 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -4771,6 +4771,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -4804,6 +4805,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -4837,6 +4839,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -4870,6 +4873,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -4903,6 +4907,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -4936,6 +4941,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -4970,6 +4976,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5004,6 +5011,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5037,6 +5045,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5070,6 +5079,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5103,6 +5113,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5136,6 +5147,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5170,6 +5182,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5204,6 +5217,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5230,6 +5244,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5256,6 +5271,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5282,6 +5298,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5308,6 +5325,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5335,6 +5353,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5361,6 +5380,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5388,6 +5408,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -12841,6 +12862,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -12888,6 +12910,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -12935,6 +12958,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -12982,6 +13006,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -13029,6 +13054,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -22133,6 +22159,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -22181,6 +22208,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -22229,6 +22257,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -22277,6 +22306,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -22325,6 +22355,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -22373,6 +22404,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -22421,6 +22453,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -22469,6 +22502,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -22517,6 +22551,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -22565,6 +22600,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -22613,6 +22649,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -22661,6 +22698,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],