Add back a gaggle of iOS bots.

These should match the old ones I removed last week.

CQ_INCLUDE_TRYBOTS=skia.primary:Build-Mac-Clang-arm-Debug-iOS,Build-Mac-Clang-arm64-Debug-iOS,Build-Mac-Clang-arm64-Release-iOS

Change-Id: I2d56332c11cdd410ab6e60d888231cf7ecd5eafd
Reviewed-on: https://skia-review.googlesource.com/8051
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>

2 files changed, 319 insertions, 0 deletions

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 6c621317fd..b055ba9876 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -1,6 +1,9 @@
 [
+  "Build-Mac-Clang-arm-Debug-iOS",
   "Build-Mac-Clang-arm-Release-iOS",
   "Build-Mac-Clang-arm64-Debug-Android",
+  "Build-Mac-Clang-arm64-Debug-iOS",
+  "Build-Mac-Clang-arm64-Release-iOS",
   "Build-Mac-Clang-x86_64-Debug",
   "Build-Mac-Clang-x86_64-Debug-CommandBuffer",
   "Build-Mac-Clang-x86_64-Release",
@@ -159,6 +162,8 @@
   "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug",
   "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
   "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
+  "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug",
+  "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release",
   "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android",
   "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-Android",
   "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
@@ -260,5 +265,6 @@
   "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
   "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
   "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
+  "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug",
   "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release"
 ]
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index fb176e3f61..148c181fe2 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -1,5 +1,11 @@
 {
   "jobs": {
+    "Build-Mac-Clang-arm-Debug-iOS": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Mac-Clang-arm-Debug-iOS"
+      ]
+    },
     "Build-Mac-Clang-arm-Release-iOS": {
       "priority": 0.8,
       "tasks": [
@@ -12,6 +18,18 @@
         "Build-Mac-Clang-arm64-Debug-Android"
       ]
     },
+    "Build-Mac-Clang-arm64-Debug-iOS": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Mac-Clang-arm64-Debug-iOS"
+      ]
+    },
+    "Build-Mac-Clang-arm64-Release-iOS": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Mac-Clang-arm64-Release-iOS"
+      ]
+    },
     "Build-Mac-Clang-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -962,6 +980,18 @@
         "Upload-Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release"
       ]
     },
+    "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug"
+      ]
+    },
+    "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release"
+      ]
+    },
     "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android": {
       "priority": 0.8,
       "tasks": [
@@ -1569,6 +1599,12 @@
         "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI"
       ]
     },
+    "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug"
+      ]
+    },
     "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release": {
       "priority": 0.8,
       "tasks": [
@@ -1577,6 +1613,31 @@
     }
   },
   "tasks": {
+    "Build-Mac-Clang-arm-Debug-iOS": {
+      "dimensions": [
+        "gpu:none",
+        "os:Mac-10.11",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Mac-Clang-arm-Debug-iOS",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "compile_skia.isolate",
+      "priority": 0.8
+    },
     "Build-Mac-Clang-arm-Release-iOS": {
       "dimensions": [
         "gpu:none",
@@ -1634,6 +1695,56 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
+    "Build-Mac-Clang-arm64-Debug-iOS": {
+      "dimensions": [
+        "gpu:none",
+        "os:Mac-10.11",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Mac-Clang-arm64-Debug-iOS",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "compile_skia.isolate",
+      "priority": 0.8
+    },
+    "Build-Mac-Clang-arm64-Release-iOS": {
+      "dimensions": [
+        "gpu:none",
+        "os:Mac-10.11",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Mac-Clang-arm64-Release-iOS",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "compile_skia.isolate",
+      "priority": 0.8
+    },
     "Build-Mac-Clang-x86_64-Debug": {
       "dimensions": [
         "gpu:none",
@@ -8086,6 +8197,102 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
+    "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:19"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:34"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Mac-Clang-arm-Debug-iOS"
+      ],
+      "dimensions": [
+        "device:iPad5,1",
+        "os:iOS-9.3.1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:19"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:34"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Mac-Clang-arm-Release-iOS"
+      ],
+      "dimensions": [
+        "device:iPad5,1",
+        "os:iOS-9.3.1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
     "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android": {
       "cipd_packages": [
         {
@@ -12955,6 +13162,54 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
+    "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:19"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:34"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Mac-Clang-arm-Debug-iOS"
+      ],
+      "dimensions": [
+        "device:iPad5,1",
+        "os:iOS-9.3.1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
     "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release": {
       "cipd_packages": [
         {
@@ -14250,6 +14505,35 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
+    "Upload-Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release": {
+      "dependencies": [
+        "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
     "Upload-Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android": {
       "dependencies": [
         "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android"
@@ -16860,6 +17144,35 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
+    "Upload-Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug": {
+      "dependencies": [
+        "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
     "Upload-Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release": {
       "dependencies": [
         "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release"