Upgrade OS and NVIDIA driver on Win10 Golo/MTV lab bots.

Bug: chromium:821040, chromium:821857
No-Try: true
Change-Id: Iebad9eca31dedfda484faa91333c42c3ba3df186
Reviewed-on: https://skia-review.googlesource.com/113740
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

2 files changed, 66 insertions, 74 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"])
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index eb1e59b018..63b021d261 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -11268,8 +11268,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:104a-23.21.13.8813",
-        "os:Windows-10-16299.125",
+        "gpu:10de:104a-23.21.13.9101",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11315,8 +11315,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:104a-23.21.13.8813",
-        "os:Windows-10-16299.125",
+        "gpu:10de:104a-23.21.13.9101",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11362,8 +11362,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:104a-23.21.13.8813",
-        "os:Windows-10-16299.125",
+        "gpu:10de:104a-23.21.13.9101",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11409,8 +11409,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11456,8 +11456,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11503,8 +11503,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11550,8 +11550,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11597,8 +11597,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11644,8 +11644,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13483,8 +13483,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13530,8 +13530,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13577,8 +13577,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -13624,8 +13624,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -14007,7 +14007,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
+        "gpu:10de:1cb3-23.21.13.9103",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -14054,7 +14054,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
+        "gpu:10de:1cb3-23.21.13.9103",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -21402,8 +21402,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:104a-23.21.13.8813",
-        "os:Windows-10-16299.125",
+        "gpu:10de:104a-23.21.13.9101",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -21450,8 +21450,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:104a-23.21.13.8813",
-        "os:Windows-10-16299.125",
+        "gpu:10de:104a-23.21.13.9101",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -21498,8 +21498,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:104a-23.21.13.8813",
-        "os:Windows-10-16299.125",
+        "gpu:10de:104a-23.21.13.9101",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -21546,8 +21546,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -21594,8 +21594,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -21642,8 +21642,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -21695,8 +21695,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -21743,8 +21743,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -21791,8 +21791,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -21839,8 +21839,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -21887,8 +21887,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -21940,8 +21940,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -23914,8 +23914,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -23962,8 +23962,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -24010,8 +24010,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -24058,8 +24058,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:1cb3-23.21.13.9103",
+        "os:Windows-10-16299.309",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -24792,7 +24792,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
+        "gpu:10de:1cb3-23.21.13.9103",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -24840,7 +24840,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
+        "gpu:10de:1cb3-23.21.13.9103",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],