From 28db288ec26bf01e203183acffb4cbd683de322f Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Fri, 17 Nov 2017 12:53:12 -0500 Subject: [PATCH] Specify image dimension for Win2016. Will remove after transition to new image. Change-Id: I4254643aa1279b6e2046d2cdef9ff1d481f85531 Reviewed-on: https://skia-review.googlesource.com/73260 Reviewed-by: Eric Boren Commit-Queue: Ben Wagner --- infra/bots/gen_tasks.go | 4 ++++ infra/bots/tasks.json | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index c0803c7e6d..e1a635595f 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -204,6 +204,10 @@ func defaultSwarmDimensions(parts map[string]string) []string { if !ok { glog.Fatalf("Entry %q not found in OS mapping.", os) } + if os == "Win2016" { + // Temporarily specify image name during transition. + d["image"] = "windows-server-2016-dc-internal-v20171010" + } } else { d["os"] = DEFAULT_OS_DEBIAN } diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index e4520c0cc3..3b91f24f78 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -12639,6 +12639,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", + "image:windows-server-2016-dc-internal-v20171010", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -12686,6 +12687,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", + "image:windows-server-2016-dc-internal-v20171010", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -12733,6 +12735,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", + "image:windows-server-2016-dc-internal-v20171010", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -12780,6 +12783,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", + "image:windows-server-2016-dc-internal-v20171010", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -12827,6 +12831,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", + "image:windows-server-2016-dc-internal-v20171010", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -21691,6 +21696,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", + "image:windows-server-2016-dc-internal-v20171010", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -21738,6 +21744,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", + "image:windows-server-2016-dc-internal-v20171010", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -21785,6 +21792,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", + "image:windows-server-2016-dc-internal-v20171010", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -21832,6 +21840,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", + "image:windows-server-2016-dc-internal-v20171010", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -21879,6 +21888,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", + "image:windows-server-2016-dc-internal-v20171010", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -21926,6 +21936,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", + "image:windows-server-2016-dc-internal-v20171010", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -21973,6 +21984,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", + "image:windows-server-2016-dc-internal-v20171010", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -22020,6 +22032,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", + "image:windows-server-2016-dc-internal-v20171010", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -22067,6 +22080,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", + "image:windows-server-2016-dc-internal-v20171010", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -22114,6 +22128,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", + "image:windows-server-2016-dc-internal-v20171010", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -22161,6 +22176,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", + "image:windows-server-2016-dc-internal-v20171010", "os:Windows-2016Server-14393", "pool:Skia" ], @@ -22208,6 +22224,7 @@ ], "dimensions": [ "cpu:x86-64-Haswell_GCE", + "image:windows-server-2016-dc-internal-v20171010", "os:Windows-2016Server-14393", "pool:Skia" ],