From 7355737731abdeb63043fc7ca0e7e5154ff17bd5 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Thu, 29 Dec 2016 16:27:03 -0500 Subject: [PATCH] Update Win version for iHD530 after driver upgrade. BUG=skia: Change-Id: I92c0c4ca9ad3d8e0fa6e0063c47284fb819fe24c Reviewed-on: https://skia-review.googlesource.com/6417 Commit-Queue: Ben Wagner Reviewed-by: Stephan Altmueller --- infra/bots/gen_tasks.go | 19 +++---------------- infra/bots/tasks.json | 8 ++++---- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 8994fa8e76..fc391378e6 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -363,22 +363,9 @@ func swarmDimensions(parts map[string]string) []string { "Win8": "Windows-8.1-SP0", "iOS": "iOS-9.3.1", }[os] - if parts["cpu_or_gpu"] == "GPU" && os == "Win10" { - // We're in the process of moving Windows Skolo bots to - // a new Windows image. - d["os"] = map[string]string{ - "AMDHD7770": "Windows-10-14393", - // In Chrome Golo; won't be updated. - "GT610": "Windows-10-10586", - "GTX1070": "Windows-10-14393", - "GTX660": "Windows-10-14393", - "GTX960": "Windows-10-14393", - "IntelHD4600": "Windows-10-14393", - // Crashing with new image. - "iHD530": "Windows-10-10586", - "IntelIris540": "Windows-10-14393", - "IntelIris6100": "Windows-10-14393", - }[parts["cpu_or_gpu_value"]] + // Chrome Golo has a different Windows image. + if parts["model"] == "Golo" && os == "Win10" { + d["os"] = "Windows-10-10586" } } else { d["os"] = DEFAULT_OS diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index d0fd9d284b..c0367c5651 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -7095,7 +7095,7 @@ ], "dimensions": [ "gpu:8086:1912", - "os:Windows-10-10586", + "os:Windows-10-14393", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -7143,7 +7143,7 @@ ], "dimensions": [ "gpu:8086:1912", - "os:Windows-10-10586", + "os:Windows-10-14393", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -11565,7 +11565,7 @@ ], "dimensions": [ "gpu:8086:1912", - "os:Windows-10-10586", + "os:Windows-10-14393", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -11613,7 +11613,7 @@ ], "dimensions": [ "gpu:8086:1912", - "os:Windows-10-10586", + "os:Windows-10-14393", "pool:Skia" ], "execution_timeout_ns": 14400000000000,