Add machine_type dimension to disambiguate bots with GTX960.

BUG=skia:

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

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 421f430..1dc4c95 100644 (file)
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -177,6 +177,17 @@ func swarmDimensions(parts map[string]string) []string {
                                glog.Fatalf("Entry %q not found in GPU mapping: %v", parts["cpu_or_gpu_value"], GPU_MAPPING)
                        }
                        d["gpu"] = gpu
+
+                       // Hack: Specify machine_type dimension for NUCs and ShuttleCs. We
+                       // temporarily have two types of machines with a GTX960. The only way to
+                       // distinguish these bots is by machine_type.
+                       machine_type, ok := map[string]string{
+                               "NUC6i7KYK": "n1-highcpu-8",
+                               "ShuttleC":  "n1-standard-8",
+                       }[parts["model"]]
+                       if ok {
+                               d["machine_type"] = machine_type
+                       }
                }
        } else {
                d["gpu"] = "none"

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 5147a4d..20a2e26 100644 (file)
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -7432,6 +7432,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -7480,6 +7481,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -7528,6 +7530,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -7576,6 +7579,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -7624,6 +7628,7 @@
       ],
       "dimensions": [
         "gpu:8086:1912",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -7672,6 +7677,7 @@
       ],
       "dimensions": [
         "gpu:8086:1912",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -12231,6 +12237,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -12279,6 +12286,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -12327,6 +12335,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -12375,6 +12384,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -12423,6 +12433,7 @@
       ],
       "dimensions": [
         "gpu:8086:1912",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
@@ -12471,6 +12482,7 @@
       ],
       "dimensions": [
         "gpu:8086:1912",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],