diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2018-02-28 14:22:27 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-28 20:41:05 +0000 |
| commit | bc98920f6c7cb188dbddec8a55be231e0b083b3c (patch) | |
| tree | d8c0645dd5df75f67da117eac21b833daa9a080d /infra/bots/gen_tasks.go | |
| parent | 65e409faca661949f8208d8c984fafe3a96bbebd (diff) | |
Switch remaining Win10 Skolo bots to new Windows image.
This affects GTX660, RadeonHD7770, and GTX1070.
Change-Id: I7b91aa4a8a3893597bb164a32e5e6b2560a84d9b
Reviewed-on: https://skia-review.googlesource.com/109812
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/gen_tasks.go')
| -rw-r--r-- | infra/bots/gen_tasks.go | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 02471f8dbf..39237eaf27 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -200,7 +200,7 @@ func defaultSwarmDimensions(parts map[string]string) []string { "Ubuntu16": "Ubuntu-16.10", "Ubuntu17": "Ubuntu-17.04", "Win": DEFAULT_OS_WIN, - "Win10": "Windows-10-15063", + "Win10": "Windows-10-16299.248", "Win2k8": "Windows-2008ServerR2-SP1", "Win2016": DEFAULT_OS_WIN, "Win7": "Windows-7-SP1", @@ -210,18 +210,10 @@ func defaultSwarmDimensions(parts map[string]string) []string { if !ok { glog.Fatalf("Entry %q not found in OS mapping.", os) } - if os == "Win10" { - // Transition to new Win image by model name. - _, ok = map[string]bool{ - "AlphaR2": true, - "NUC5i7RYH": true, - "NUC6i5SYK": true, - "NUCD34010WYKH": true, - "ShuttleC": true, - }[parts["model"]] - if ok { - d["os"] = "Windows-10-16299.248" - } + if os == "Win10" && parts["model"] == "Golo" { + // Golo/MTV lab bots have Windows 10 version 1703, whereas Skolo bots have Windows 10 version + // 1709. + d["os"] = "Windows-10-15063" } } else { d["os"] = DEFAULT_OS_DEBIAN |