Remove temporary image Swarming dimension.

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

2 files changed, 0 insertions, 39 deletions

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 91a2189c5f..8428e45d7a 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -204,10 +204,6 @@ func defaultSwarmDimensions(parts map[string]string) []string {
 		if !ok {
 			glog.Fatalf("Entry %q not found in OS mapping.", os)
 		}
-		if d["os"] == DEFAULT_OS_WIN {
-			// Temporarily specify image name during transition.
-			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 a6494562f9..270de6e4b2 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -5037,7 +5037,6 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5073,7 +5072,6 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5109,7 +5107,6 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5150,7 +5147,6 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5186,7 +5182,6 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5222,7 +5217,6 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5263,7 +5257,6 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5294,7 +5287,6 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5325,7 +5317,6 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5356,7 +5347,6 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5387,7 +5377,6 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5418,7 +5407,6 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5449,7 +5437,6 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5480,7 +5467,6 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5516,7 +5502,6 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5547,7 +5532,6 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5578,7 +5562,6 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -5614,7 +5597,6 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -13275,7 +13257,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -13323,7 +13304,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -13371,7 +13351,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -13419,7 +13398,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -13467,7 +13445,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -22861,7 +22838,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -22909,7 +22885,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -22957,7 +22932,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -23005,7 +22979,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -23053,7 +23026,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -23101,7 +23073,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -23149,7 +23120,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -23197,7 +23167,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -23245,7 +23214,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -23293,7 +23261,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -23341,7 +23308,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -23389,7 +23355,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "image:windows-server-2016-dc-v20171114",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],