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>
This commit is contained in:
Ben Wagner 2019-09-26 18:31:40 -04:00 committed by Skia Commit-Bot
parent 94ed83f3ab
commit 097e1c6594
2 changed files with 14 additions and 14 deletions

View File

@ -667,7 +667,7 @@ func (b *builder) defaultSwarmDimensions(parts map[string]string) []string {
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"])

View File

@ -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"
],