Remove transitional parts from iOS job names

Bug: skia:
Change-Id: If19e5a956d3f10448cfe889127c2f79d9c42926e
Reviewed-on: https://skia-review.googlesource.com/17372
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Stephan Altmueller <stephana@google.com>

3 files changed, 93 insertions, 115 deletions

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index f81b1ac167..9a919a50fd 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -92,7 +92,7 @@ func deriveCompileTaskName(jobName string, parts map[string]string) string {
 		ec := []string{}
 		if val := parts["extra_config"]; val != "" {
 			ec = strings.Split(val, "_")
-			ignore := []string{"Skpbench", "AbandonGpuContext", "PreAbandonGpuContext", "Valgrind", "ReleaseAndAbandonGpuContext", "RaspberryPi"}
+			ignore := []string{"Skpbench", "AbandonGpuContext", "PreAbandonGpuContext", "Valgrind", "ReleaseAndAbandonGpuContext"}
 			keep := make([]string, 0, len(ec))
 			for _, part := range ec {
 				if !util.In(part, ignore) {
@@ -158,7 +158,7 @@ func swarmDimensions(parts map[string]string) []string {
 			"Win2k8":     "Windows-2008ServerR2-SP1",
 			"Win7":       "Windows-7-SP1",
 			"Win8":       "Windows-8.1-SP0",
-			"iOS":        "iOS-9.3.1",
+			"iOS":        "iOS-10.3.1",
 		}[os]
 		// Chrome Golo has a different Windows image.
 		if parts["model"] == "Golo" && os == "Win10" {
@@ -184,14 +184,6 @@ func swarmDimensions(parts map[string]string) []string {
 				"iPhone7":   "iPhone9,1",
 				"iPadPro":   "iPad6,3",
 			}[parts["model"]]
-
-			// TODO(stephana): Remove once we are fully switched to RaspberryPi.
-
-			// Use the RPi host.
-			if parts["extra_config"] == "RaspberryPi" {
-				d["os"] = "iOS-10.3.1"
-				d["machine_type"] = "RaspberryPi"
-			}
 		} else if parts["cpu_or_gpu"] == "CPU" {
 			d["gpu"] = "none"
 			d["cpu"] = map[string]string{
@@ -423,14 +415,13 @@ func recreateSKPs(b *specs.TasksCfgBuilder, name string) string {
 	return name
 }
 
-
 // updateMetaConfig generates a UpdateMetaConfig task. Returns the name of the
 // last task in the generated chain of tasks, which the Job should add as a
 // dependency.
 func updateMetaConfig(b *specs.TasksCfgBuilder, name string) string {
 	b.MustAddTask(name, &specs.TaskSpec{
-		CipdPackages:     []*specs.CipdPackage{},
-		Dimensions:       linuxGceDimensions(),
+		CipdPackages: []*specs.CipdPackage{},
+		Dimensions:   linuxGceDimensions(),
 		ExtraArgs: []string{
 			"--workdir", "../../..", "update_meta_config",
 			fmt.Sprintf("repository=%s", specs.PLACEHOLDER_REPO),
@@ -442,13 +433,12 @@ func updateMetaConfig(b *specs.TasksCfgBuilder, name string) string {
 			fmt.Sprintf("patch_issue=%s", specs.PLACEHOLDER_ISSUE),
 			fmt.Sprintf("patch_set=%s", specs.PLACEHOLDER_PATCHSET),
 		},
-		Isolate:   "meta_config.isolate",
-		Priority:  0.8,
+		Isolate:  "meta_config.isolate",
+		Priority: 0.8,
 	})
 	return name
 }
 
-
 // ctSKPs generates a CT SKPs task. Returns the name of the last task in the
 // generated chain of tasks, which the Job should add as a dependency.
 func ctSKPs(b *specs.TasksCfgBuilder, name string) string {
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 45782a2a32..2a32935f45 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -216,12 +216,12 @@
   "Perf-Win8-MSVC-Golo-CPU-AVX-x86_64-Debug",
   "Perf-Win8-MSVC-Golo-CPU-AVX-x86_64-Debug-GDI",
   "Perf-Win8-MSVC-Golo-CPU-AVX-x86_64-Release",
-  "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi",
-  "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi",
-  "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi",
-  "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi",
-  "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi",
-  "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi",
+  "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug",
+  "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release",
+  "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug",
+  "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release",
+  "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug",
+  "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release",
   "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
   "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
   "Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Debug-Android",
@@ -371,10 +371,10 @@
   "Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Debug-GDI",
   "Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Release",
   "Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Release-GDI",
-  "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi",
-  "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi",
-  "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi",
-  "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi",
-  "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi",
-  "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi"
+  "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug",
+  "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release",
+  "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug",
+  "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release",
+  "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug",
+  "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release"
 ]
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 87e7b6ce61..77fc078ca3 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -1305,40 +1305,40 @@
         "Upload-Perf-Win8-MSVC-Golo-CPU-AVX-x86_64-Release"
       ]
     },
-    "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi": {
+    "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi"
+        "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug"
       ]
     },
-    "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi": {
+    "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi"
+        "Upload-Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release"
       ]
     },
-    "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi": {
+    "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi"
+        "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug"
       ]
     },
-    "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi": {
+    "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi"
+        "Upload-Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release"
       ]
     },
-    "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi": {
+    "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi"
+        "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug"
       ]
     },
-    "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi": {
+    "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi"
+        "Upload-Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release"
       ]
     },
     "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
@@ -2236,40 +2236,40 @@
         "Upload-Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Release-GDI"
       ]
     },
-    "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi": {
+    "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi"
+        "Upload-Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug"
       ]
     },
-    "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi": {
+    "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi"
+        "Upload-Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release"
       ]
     },
-    "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi": {
+    "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi"
+        "Upload-Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug"
       ]
     },
-    "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi": {
+    "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi"
+        "Upload-Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release"
       ]
     },
-    "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi": {
+    "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi"
+        "Upload-Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug"
       ]
     },
-    "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi": {
+    "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi"
+        "Upload-Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release"
       ]
     }
   },
@@ -10309,7 +10309,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi": {
+    "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug": {
       "dependencies": [
         "Build-Mac-Clang-arm64-Debug-iOS",
         "Housekeeper-PerCommit-BundleRecipes",
@@ -10319,7 +10319,6 @@
       ],
       "dimensions": [
         "device:iPad6,3",
-        "machine_type:RaspberryPi",
         "os:iOS-10.3.1",
         "pool:Skia"
       ],
@@ -10330,7 +10329,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi",
+        "buildername=Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10343,7 +10342,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi": {
+    "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release": {
       "dependencies": [
         "Build-Mac-Clang-arm64-Release-iOS",
         "Housekeeper-PerCommit-BundleRecipes",
@@ -10353,7 +10352,6 @@
       ],
       "dimensions": [
         "device:iPad6,3",
-        "machine_type:RaspberryPi",
         "os:iOS-10.3.1",
         "pool:Skia"
       ],
@@ -10364,7 +10362,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi",
+        "buildername=Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10377,7 +10375,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi": {
+    "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug": {
       "dependencies": [
         "Build-Mac-Clang-arm64-Debug-iOS",
         "Housekeeper-PerCommit-BundleRecipes",
@@ -10387,7 +10385,6 @@
       ],
       "dimensions": [
         "device:iPhone7,2",
-        "machine_type:RaspberryPi",
         "os:iOS-10.3.1",
         "pool:Skia"
       ],
@@ -10398,7 +10395,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi",
+        "buildername=Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10411,7 +10408,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi": {
+    "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release": {
       "dependencies": [
         "Build-Mac-Clang-arm64-Release-iOS",
         "Housekeeper-PerCommit-BundleRecipes",
@@ -10421,7 +10418,6 @@
       ],
       "dimensions": [
         "device:iPhone7,2",
-        "machine_type:RaspberryPi",
         "os:iOS-10.3.1",
         "pool:Skia"
       ],
@@ -10432,7 +10428,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi",
+        "buildername=Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10445,7 +10441,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi": {
+    "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug": {
       "dependencies": [
         "Build-Mac-Clang-arm64-Debug-iOS",
         "Housekeeper-PerCommit-BundleRecipes",
@@ -10455,7 +10451,6 @@
       ],
       "dimensions": [
         "device:iPhone9,1",
-        "machine_type:RaspberryPi",
         "os:iOS-10.3.1",
         "pool:Skia"
       ],
@@ -10466,7 +10461,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi",
+        "buildername=Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10479,7 +10474,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi": {
+    "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release": {
       "dependencies": [
         "Build-Mac-Clang-arm64-Release-iOS",
         "Housekeeper-PerCommit-BundleRecipes",
@@ -10489,7 +10484,6 @@
       ],
       "dimensions": [
         "device:iPhone9,1",
-        "machine_type:RaspberryPi",
         "os:iOS-10.3.1",
         "pool:Skia"
       ],
@@ -10500,7 +10494,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi",
+        "buildername=Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16945,7 +16939,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi": {
+    "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug": {
       "dependencies": [
         "Build-Mac-Clang-arm64-Debug-iOS",
         "Housekeeper-PerCommit-BundleRecipes",
@@ -16955,7 +16949,6 @@
       ],
       "dimensions": [
         "device:iPad6,3",
-        "machine_type:RaspberryPi",
         "os:iOS-10.3.1",
         "pool:Skia"
       ],
@@ -16966,7 +16959,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi",
+        "buildername=Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -16979,7 +16972,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi": {
+    "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release": {
       "dependencies": [
         "Build-Mac-Clang-arm64-Release-iOS",
         "Housekeeper-PerCommit-BundleRecipes",
@@ -16989,7 +16982,6 @@
       ],
       "dimensions": [
         "device:iPad6,3",
-        "machine_type:RaspberryPi",
         "os:iOS-10.3.1",
         "pool:Skia"
       ],
@@ -17000,7 +16992,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi",
+        "buildername=Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17013,7 +17005,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi": {
+    "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug": {
       "dependencies": [
         "Build-Mac-Clang-arm64-Debug-iOS",
         "Housekeeper-PerCommit-BundleRecipes",
@@ -17023,7 +17015,6 @@
       ],
       "dimensions": [
         "device:iPhone7,2",
-        "machine_type:RaspberryPi",
         "os:iOS-10.3.1",
         "pool:Skia"
       ],
@@ -17034,7 +17025,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi",
+        "buildername=Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17047,7 +17038,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi": {
+    "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release": {
       "dependencies": [
         "Build-Mac-Clang-arm64-Release-iOS",
         "Housekeeper-PerCommit-BundleRecipes",
@@ -17057,7 +17048,6 @@
       ],
       "dimensions": [
         "device:iPhone7,2",
-        "machine_type:RaspberryPi",
         "os:iOS-10.3.1",
         "pool:Skia"
       ],
@@ -17068,7 +17058,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi",
+        "buildername=Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17081,7 +17071,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi": {
+    "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug": {
       "dependencies": [
         "Build-Mac-Clang-arm64-Debug-iOS",
         "Housekeeper-PerCommit-BundleRecipes",
@@ -17091,7 +17081,6 @@
       ],
       "dimensions": [
         "device:iPhone9,1",
-        "machine_type:RaspberryPi",
         "os:iOS-10.3.1",
         "pool:Skia"
       ],
@@ -17102,7 +17091,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi",
+        "buildername=Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17115,7 +17104,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi": {
+    "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release": {
       "dependencies": [
         "Build-Mac-Clang-arm64-Release-iOS",
         "Housekeeper-PerCommit-BundleRecipes",
@@ -17125,7 +17114,6 @@
       ],
       "dimensions": [
         "device:iPhone9,1",
-        "machine_type:RaspberryPi",
         "os:iOS-10.3.1",
         "pool:Skia"
       ],
@@ -17136,7 +17124,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi",
+        "buildername=Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -18796,9 +18784,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi": {
+    "Upload-Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release": {
       "dependencies": [
-        "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi"
+        "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -18811,7 +18799,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi",
+        "buildername=Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -18823,9 +18811,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi": {
+    "Upload-Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release": {
       "dependencies": [
-        "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi"
+        "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -18838,7 +18826,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi",
+        "buildername=Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -18850,9 +18838,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi": {
+    "Upload-Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release": {
       "dependencies": [
-        "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi"
+        "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -18865,7 +18853,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi",
+        "buildername=Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22495,9 +22483,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi": {
+    "Upload-Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug": {
       "dependencies": [
-        "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi"
+        "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -22510,7 +22498,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-RaspberryPi",
+        "buildername=Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22522,9 +22510,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi": {
+    "Upload-Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release": {
       "dependencies": [
-        "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi"
+        "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -22537,7 +22525,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-RaspberryPi",
+        "buildername=Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22549,9 +22537,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi": {
+    "Upload-Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug": {
       "dependencies": [
-        "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi"
+        "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -22564,7 +22552,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-RaspberryPi",
+        "buildername=Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22576,9 +22564,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi": {
+    "Upload-Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release": {
       "dependencies": [
-        "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi"
+        "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -22591,7 +22579,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-RaspberryPi",
+        "buildername=Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22603,9 +22591,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi": {
+    "Upload-Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug": {
       "dependencies": [
-        "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi"
+        "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -22618,7 +22606,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-RaspberryPi",
+        "buildername=Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22630,9 +22618,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi": {
+    "Upload-Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release": {
       "dependencies": [
-        "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi"
+        "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -22645,7 +22633,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-RaspberryPi",
+        "buildername=Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",