commit 097e1c65943d08dd8d18874596025e2c07a5b251
author Ben Wagner <benjaminwagner@google.com> Thu Sep 26 18:31:40 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Sep 27 17:37:15 2019 +0000
tree c5831b99e98ce3bab21548863d9ad76e92e1bdd7
parent 94ed83f3ab3a57191dc0a04d0ef7a774643be96c

Switch to device_type dimension for iOS devices

Change-Id: Ia71228659b18233e8734658a12ea6839aaf71747
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/244719
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>

infra/bots/gen_tasks_logic/gen_tasks_logic.go

diff --git a/infra/bots/gen_tasks_logic/gen_tasks_logic.go b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
index 40bb733..73834d0 100644
--- a/infra/bots/gen_tasks_logic/gen_tasks_logic.go
+++ b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
@@ -667,7 +667,7 @@
 			if !ok {
 				glog.Fatalf("Entry %q not found in iOS mapping.", parts["model"])
 			}
-			d["device"] = device
+			d["device_type"] = device
 		} else if strings.Contains(parts["extra_config"], "SwiftShader") {
 			if parts["model"] != "GCE" || d["os"] != DEFAULT_OS_DEBIAN || parts["cpu_or_gpu_value"] != "SwiftShader" {
 				glog.Fatalf("Please update defaultSwarmDimensions for SwiftShader %s %s %s.", parts["os"], parts["model"], parts["cpu_or_gpu_value"])

infra/bots/tasks.json

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index ae8de8e..8c599af 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -23920,7 +23920,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device:iPad6,3",
+        "device_type:iPad6,3",
         "os:iOS-11.4.1",
         "pool:Skia"
       ],
@@ -23985,7 +23985,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device:iPad6,3",
+        "device_type:iPad6,3",
         "os:iOS-11.4.1",
         "pool:Skia"
       ],
@@ -24050,7 +24050,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device:iPhone7,2",
+        "device_type:iPhone7,2",
         "os:iOS-11.4.1",
         "pool:Skia"
       ],
@@ -24115,7 +24115,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device:iPhone7,2",
+        "device_type:iPhone7,2",
         "os:iOS-11.4.1",
         "pool:Skia"
       ],
@@ -24180,7 +24180,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device:iPhone9,1",
+        "device_type:iPhone9,1",
         "os:iOS-11.4.1",
         "pool:Skia"
       ],
@@ -46992,7 +46992,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device:iPad6,3",
+        "device_type:iPad6,3",
         "os:iOS-11.4.1",
         "pool:Skia"
       ],
@@ -47057,7 +47057,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device:iPad6,3",
+        "device_type:iPad6,3",
         "os:iOS-11.4.1",
         "pool:Skia"
       ],
@@ -47122,7 +47122,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device:iPhone7,2",
+        "device_type:iPhone7,2",
         "os:iOS-11.4.1",
         "pool:Skia"
       ],
@@ -47187,7 +47187,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device:iPhone7,2",
+        "device_type:iPhone7,2",
         "os:iOS-11.4.1",
         "pool:Skia"
       ],
@@ -47252,7 +47252,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device:iPhone7,2",
+        "device_type:iPhone7,2",
         "os:iOS-11.4.1",
         "pool:Skia"
       ],
@@ -47317,7 +47317,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device:iPhone9,1",
+        "device_type:iPhone9,1",
         "os:iOS-11.4.1",
         "pool:Skia"
       ],
@@ -47382,7 +47382,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device:iPhone9,1",
+        "device_type:iPhone9,1",
         "os:iOS-11.4.1",
         "pool:Skia"
       ],
@@ -47447,7 +47447,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device:iPhone9,1",
+        "device_type:iPhone9,1",
         "os:iOS-11.4.1",
         "pool:Skia"
       ],