[infra] Add image dimension for Win GCE bots
Change-Id: Ib7a8205992c6c1f4d93448afe54468f77511f1f0
Reviewed-on: https://skia-review.googlesource.com/123585
Auto-Submit: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index e9b1d20..74b26c2 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -380,6 +380,10 @@
// ChOps-owned machines have Windows 10 v1709, but a slightly different version than Skolo.
d["os"] = "Windows-10-16299.309"
}
+ if d["os"] == DEFAULT_OS_WIN {
+ // TODO(dogben): Temporarily add image dimension during upgrade.
+ d["image"] = "windows-server-2016-dc-v20171114"
+ }
} else {
d["os"] = DEFAULT_OS_DEBIAN
}
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index ede69c4..e07fe36 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -12690,6 +12690,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-highcpu-64",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -12803,6 +12804,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-highcpu-64",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -12916,6 +12918,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-highcpu-64",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -13029,6 +13032,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-highcpu-64",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -13142,6 +13146,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-highcpu-64",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -13255,6 +13260,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-highcpu-64",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -13368,6 +13374,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-highcpu-64",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -13482,6 +13489,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-highcpu-64",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -13595,6 +13603,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-highcpu-64",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -13708,6 +13717,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-highcpu-64",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -13821,6 +13831,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-highcpu-64",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -13935,6 +13946,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-highcpu-64",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -14043,6 +14055,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-highcpu-64",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -14151,6 +14164,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-highcpu-64",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -14259,6 +14273,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-highcpu-64",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -14368,6 +14383,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-highcpu-64",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -14476,6 +14492,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-highcpu-64",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -14585,6 +14602,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-highcpu-64",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -34139,6 +34157,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -34248,6 +34267,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -34357,6 +34377,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -34466,6 +34487,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -34575,6 +34597,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -34684,6 +34707,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -34793,6 +34817,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -34902,6 +34927,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -60718,6 +60744,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -60827,6 +60854,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -60936,6 +60964,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -61045,6 +61074,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -61154,6 +61184,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -61263,6 +61294,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -61372,6 +61404,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -61481,6 +61514,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -61590,6 +61624,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -61699,6 +61734,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -61808,6 +61844,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -61917,6 +61954,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -62026,6 +62064,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -62135,6 +62174,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -62244,6 +62284,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"
@@ -62353,6 +62394,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
+ "image:windows-server-2016-dc-v20171114",
"machine_type:n1-standard-16",
"os:Windows-2016Server-14393",
"pool:Skia"