Fix dimensions for Skia iOS Swarming bots

scripts/slave/recipes/skia/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming.json

 [
   {
     "cmd": [
       "git",
       "remote",
       "set-url",
       "origin",
       "https://skia.googlesource.com/skia.git"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
@@ skipping 73 matching lines @@
       "@@@STEP_LOG_END@json.output@@@",
       "@@@SET_BUILD_PROPERTY@got_revision@164710@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
       "/path/to/tmp/json",
-      "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming"
+      "Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "name": "exec buildbot_spec.py",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"build_targets\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"dm\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"iOSShell\"@@@",
       "@@@STEP_LOG_LINE@json.output@  ], @@@",
       "@@@STEP_LOG_LINE@json.output@  \"builder_cfg\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"arch\": \"x86_64\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"arch\": \"Arm7\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"compiler\": \"Clang\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"configuration\": \"Release\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu_or_gpu\": \"CPU\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu_or_gpu_value\": \"AVX\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"cpu_or_gpu\": \"GPU\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"cpu_or_gpu_value\": \"SGX554\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"extra_config\": \"Swarming\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"is_trybot\": false, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"model\": \"MacMini6.2\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"Mac\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"model\": \"iPad4\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"os\": \"iOS\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"role\": \"Test\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"configuration\": \"Release\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"device_cfg\": \"iPad4,1\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"dm_flags\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    \"--dummy-flags\"@@@",
       "@@@STEP_LOG_LINE@json.output@  ], @@@",
       "@@@STEP_LOG_LINE@json.output@  \"do_perf_steps\": false, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"do_test_steps\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"env\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"CC\": \"/usr/bin/clang\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"CXX\": \"/usr/bin/clang++\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"GYP_DEFINES\": \"skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"nanobench_flags\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    \"--dummy-flags\"@@@",
       "@@@STEP_LOG_LINE@json.output@  ], @@@",
       "@@@STEP_LOG_LINE@json.output@  \"upload_dm_results\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"upload_perf_results\": false@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
@@ skipping 243 matching lines @@
       "@@@STEP_LOG_END@json.output@@@",
       "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"isolate_recipes\": \"[dummy hash for isolate_recipes]\"}@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
       "/path/to/tmp/json",
-      "Build-Mac-Clang-x86_64-Release-Swarming"
+      "Build-Mac-Clang-Arm7-Release-iOS"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "name": "exec buildbot_spec.py (2)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"build_targets\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    \"most\"@@@",
       "@@@STEP_LOG_LINE@json.output@  ], @@@",
       "@@@STEP_LOG_LINE@json.output@  \"builder_cfg\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"compiler\": \"Clang\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"configuration\": \"Release\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"extra_config\": \"Swarming\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"extra_config\": \"iOS\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"is_trybot\": false, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"os\": \"Mac\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"role\": \"Build\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"target_arch\": \"x86_64\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"target_arch\": \"Arm7\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"configuration\": \"Release\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"dm_flags\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    \"--dummy-flags\"@@@",
       "@@@STEP_LOG_LINE@json.output@  ], @@@",
       "@@@STEP_LOG_LINE@json.output@  \"do_perf_steps\": false, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"do_test_steps\": false, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"env\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"CC\": \"/usr/bin/clang\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"CXX\": \"/usr/bin/clang++\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"GYP_DEFINES\": \"skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=1\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"nanobench_flags\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    \"--dummy-flags\"@@@",
       "@@@STEP_LOG_LINE@json.output@  ], @@@",
       "@@@STEP_LOG_LINE@json.output@  \"upload_dm_results\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"upload_perf_results\": false@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
@@ skipping 100 matching lines @@
       "trigger",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--isolate-server",
       "https://isolateserver.appspot.com",
       "--priority",
       "90",
       "--shards",
       "1",
       "--task-name",
-      "compile_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5",
+      "compile_skia/Mac/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming/5",
       "--dump-json",
       "/path/to/tmp/json",
       "--expiration",
       "14400",
       "--io-timeout",
       "1200",
       "--hard-timeout",
       "3600",
       "--dimension",
       "gpu",
       "none",
       "--dimension",
       "os",
       "Mac",
       "--dimension",
       "pool",
       "Skia",
       "--tag",
-      "buildername:Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming",
+      "buildername:Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming",
       "--tag",
       "buildnumber:5",
       "--tag",
       "data:def456",
       "--tag",
       "master:client.skia.fyi",
       "--tag",
       "name:compile_skia",
       "--tag",
       "os:Mac",
       "--tag",
       "slavename:skiabot-linux-housekeeper-003",
       "--tag",
       "stepname:compile_skia on Mac",
       "--idempotent",
       "def456",
       "--",
       "--workdir",
       "../../..",
       "skia/swarm_compile",
-      "buildername=Build-Mac-Clang-x86_64-Release-Swarming",
+      "buildername=Build-Mac-Clang-Arm7-Release-iOS",
       "mastername=client.skia.fyi",
       "buildnumber=5",
       "slavename=skiabot-linux-housekeeper-003",
       "reason=Triggered by Skia swarm_trigger Recipe",
       "swarm_out_dir=${ISOLATED_OUTDIR}",
       "revision=164710"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] compile_skia on Mac",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"compile_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"compile_skia/Mac/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming/5\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"compile_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"compile_skia/Mac/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming/5\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/swarming.client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
-      "compile_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5",
+      "compile_skia/Mac/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming/5",
       "--task-summary-json",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "compile_skia on Mac",
     "~followup_annotations": [
       "@@@STEP_TEXT@swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"shards\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    {@@@",
@@ skipping 206 matching lines @@
       "trigger",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--isolate-server",
       "https://isolateserver.appspot.com",
       "--priority",
       "90",
       "--shards",
       "1",
       "--task-name",
-      "test_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5",
+      "test_skia/iOS-9.2/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming/5",
       "--dump-json",
       "/path/to/tmp/json",
       "--expiration",
       "14400",
       "--io-timeout",
       "1200",
       "--hard-timeout",
       "3600",
       "--dimension",
-      "gpu",
-      "none",
+      "device",
+      "iPad4,1",
       "--dimension",
       "os",
-      "Mac",
+      "iOS-9.2",
       "--dimension",
       "pool",
       "Skia",
       "--tag",
-      "buildername:Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming",
+      "buildername:Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming",
       "--tag",
       "buildnumber:5",
       "--tag",
       "data:def456",
       "--tag",
       "master:client.skia.fyi",
       "--tag",
       "name:test_skia",
       "--tag",
-      "os:Mac",
+      "os:iOS-9.2",
       "--tag",
       "slavename:skiabot-linux-housekeeper-003",
       "--tag",
-      "stepname:test_skia on Mac",
+      "stepname:test_skia on iOS-9.2",
       "def456",
       "--",
       "--workdir",
       "../../..",
       "skia/swarm_test",
-      "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming",
+      "buildername=Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming",
       "mastername=client.skia.fyi",
       "buildnumber=5",
       "slavename=skiabot-linux-housekeeper-003",
       "reason=Triggered by Skia swarm_trigger Recipe",
       "swarm_out_dir=${ISOLATED_OUTDIR}",
       "revision=164710"
     ],
     "cwd": "[SLAVE_BUILD]",
-    "name": "[trigger] test_skia on Mac",
+    "name": "[trigger] test_skia on iOS-9.2",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"test_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"test_skia/iOS-9.2/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming/5\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"test_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"test_skia/iOS-9.2/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming/5\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@"
     ]
   },
@@ skipping 22 matching lines @@
       "python",
       "-u",
       "[SLAVE_BUILD]/swarming.client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
-      "test_skia/Mac/def456/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming/5",
+      "test_skia/iOS-9.2/def456/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming/5",
       "--task-summary-json",
       "/path/to/tmp/json",
       "--task-output-dir",
       "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia"
     ],
     "cwd": "[SLAVE_BUILD]",
-    "name": "test_skia on Mac",
+    "name": "test_skia on iOS-9.2",
     "~followup_annotations": [
       "@@@STEP_TEXT@swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"shards\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"abandoned_ts\": null, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"bot_id\": \"vm30\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"completed_ts\": \"2014-09-25T01:42:00.123\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"created_ts\": \"2014-09-25T01:41:00.123\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"durations\": [@@@",
@@ skipping 62 matching lines @@
     "cwd": "[SLAVE_BUILD]",
     "name": "dm_dir"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::skia]/resources/upload_dm_results.py",
       "[SLAVE_BUILD]/dm",
       "164710",
-      "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming",
+      "Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming",
       "5",
       "",
       "[SLAVE_BUILD]/skia/common/py/utils"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "env": {
       "AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto",
       "BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto"
     },
     "name": "Upload DM Results"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]