diff options
Diffstat (limited to 'infra/bots/gen_tasks.go')
| -rw-r--r-- | infra/bots/gen_tasks.go | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 74b16ef240..5ae1cb7d7d 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -213,16 +213,8 @@ func defaultSwarmDimensions(parts map[string]string) []string { glog.Fatalf("Entry %q not found in OS mapping.", os) } if os == "Win10" && parts["model"] == "Golo" { - // ChOps-owned machines have different Windows images than Skolo machines. - d["os"], ok = map[string]string{ - // MTV lab bots with Quadro GPU have Windows 10 v1703. - "QuadroP400": "Windows-10-15063", - // Golo bots with GT610 have Windows 10 v1709, but a slightly different version than Skolo. - "GT610": "Windows-10-16299.125", - }[parts["cpu_or_gpu_value"]] - if !ok { - glog.Fatalf("Entry %q not found in Win10 Golo OS mapping.", parts["cpu_or_gpu_value"]) - } + // ChOps-owned machines have Windows 10 v1709, but a slightly different version than Skolo. + d["os"] = "Windows-10-16299.309" } } else { d["os"] = DEFAULT_OS_DEBIAN @@ -295,7 +287,7 @@ func defaultSwarmDimensions(parts map[string]string) []string { } else { if strings.Contains(parts["os"], "Win") { gpu, ok := map[string]string{ - "GT610": "10de:104a-23.21.13.8813", + "GT610": "10de:104a-23.21.13.9101", "GTX1070": "10de:1ba1-23.21.13.9101", "GTX660": "10de:11c0-23.21.13.9101", "GTX960": "10de:1401-23.21.13.9101", @@ -304,7 +296,7 @@ func defaultSwarmDimensions(parts map[string]string) []string { "IntelIris6100": "8086:162b-20.19.15.4835", "RadeonHD7770": "1002:683d-23.20.15017.4003", "RadeonR9M470X": "1002:6646-23.20.15017.4003", - "QuadroP400": "10de:1cb3-22.21.13.8205", + "QuadroP400": "10de:1cb3-23.21.13.9103", }[parts["cpu_or_gpu_value"]] if !ok { glog.Fatalf("Entry %q not found in Win GPU mapping.", parts["cpu_or_gpu_value"]) |