Update Win2016 bots.
Change-Id: I71f36920a11cb36c58c0c9ff1b468b77ca356c1b Reviewed-on: https://skia-review.googlesource.com/142160 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
This commit is contained in:
parent
36bdc09078
commit
7a87962e38
@ -434,7 +434,7 @@ func defaultSwarmDimensions(parts map[string]string) []string {
|
||||
}
|
||||
if d["os"] == DEFAULT_OS_WIN {
|
||||
// TODO(dogben): Temporarily add image dimension during upgrade.
|
||||
d["image"] = "windows-server-2016-dc-v20180410"
|
||||
d["image"] = "windows-server-2016-dc-v20180710"
|
||||
}
|
||||
if d["os"] == DEFAULT_OS_MAC && (parts["model"] == "MacBook10.1" || parts["model"] == "MacBookAir7.2") {
|
||||
// TODO(dogben): Get all Mac bots on the same version.
|
||||
|
@ -14490,7 +14490,7 @@
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-highcpu-64",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -14627,7 +14627,7 @@
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-highcpu-64",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -14764,7 +14764,7 @@
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-highcpu-64",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -14901,7 +14901,7 @@
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-highcpu-64",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -15038,7 +15038,7 @@
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-highcpu-64",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -15175,7 +15175,7 @@
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-highcpu-64",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -15312,7 +15312,7 @@
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-highcpu-64",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -15450,7 +15450,7 @@
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-highcpu-64",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -15587,7 +15587,7 @@
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-highcpu-64",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -15724,7 +15724,7 @@
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-highcpu-64",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -15861,7 +15861,7 @@
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-highcpu-64",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -15999,7 +15999,7 @@
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-highcpu-64",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -16131,7 +16131,7 @@
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-highcpu-64",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -16263,7 +16263,7 @@
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-highcpu-64",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -16395,7 +16395,7 @@
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-highcpu-64",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -16528,7 +16528,7 @@
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-highcpu-64",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -16660,7 +16660,7 @@
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-highcpu-64",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -16793,7 +16793,7 @@
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-highcpu-64",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -38450,7 +38450,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -38569,7 +38569,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -38688,7 +38688,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -38807,7 +38807,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -38926,7 +38926,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -39045,7 +39045,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -39164,7 +39164,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -66750,7 +66750,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -66869,7 +66869,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -66988,7 +66988,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -67107,7 +67107,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -67226,7 +67226,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -67345,7 +67345,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -67464,7 +67464,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -67583,7 +67583,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -67702,7 +67702,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -67821,7 +67821,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -67940,7 +67940,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -68059,7 +68059,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -68178,7 +68178,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -68297,7 +68297,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -68416,7 +68416,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
@ -68535,7 +68535,7 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"image:windows-server-2016-dc-v20180410",
|
||||
"image:windows-server-2016-dc-v20180710",
|
||||
"machine_type:n1-standard-16",
|
||||
"os:Windows-2016Server-14393",
|
||||
"pool:Skia"
|
||||
|
Loading…
Reference in New Issue
Block a user