Fix dimensions for Skia iOS Swarming bots

scripts/slave/recipes/skia/swarm_trigger.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # Recipe module for Skia Swarming trigger.
 
 
 import json
 
@@ skipping 15 matching lines @@
 TEST_BUILDERS = {
   'client.skia.fyi': {
     'skiabot-linux-housekeeper-003': [
       'Build-Mac-Clang-x86_64-Release-Swarming',
       'Build-Ubuntu-GCC-x86_64-Debug-Swarming',
       'Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot',
       'Build-Ubuntu-GCC-x86_64-Release-SwarmingValgrind',
       'Build-Win8-MSVC-x86_64-Release-Swarming',
       'Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot',
       'Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release-Swarming',
+      'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Swarming',
       'Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming',
       'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming',
       'Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Swarming',
       'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-SwarmingValgrind',
     ],
   },
 }
 
 
 def derive_compile_bot_name(builder_name, builder_spec):
@@ skipping 26 matching lines @@
     'pool': 'Skia',
   }
   builder_cfg = builder_spec['builder_cfg']
   dimensions['os'] = builder_cfg['os']
   if 'Win' in builder_cfg['os']:
     dimensions['os'] = 'Windows'  # pragma: no cover
   if builder_cfg['role'] in ('Test', 'Perf'):
     if 'Android' in builder_cfg['os']:
       # For Android, the device type is a better dimension than CPU or GPU.
       dimensions['product.board'] = builder_spec['product.board']
+    elif 'iOS' in builder_cfg['os']:
+      # For iOS, the device type is a better dimension than CPU or GPU.
+      dimensions['device'] = builder_spec['device_cfg']
+      # TODO(borenet): Replace this hack with something better.
+      dimensions['os'] = 'iOS-9.2'
     elif builder_cfg['cpu_or_gpu'] == 'CPU':
       dimensions['gpu'] = 'none'
       # TODO(borenet): Add appropriate CPU dimension(s).
       #dimensions['cpu'] = builder_cfg['cpu_or_gpu_value']
     else:  # pragma: no cover
       # TODO: Create a dictionary of GPU name to device id when we have more
       #       GPUs listed here.
       if builder_cfg['cpu_or_gpu_value'] == 'GTX550Ti':
         dimensions['gpu'] = '10de:1244'
       else:
@@ skipping 338 matching lines @@
   builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Swarming'
   master = 'client.skia'
   slave = 'skiabot-linux-test-000'
   test = test_for_bot(api, builder, master, slave, 'No_downloaded_SKP_VERSION')
   test += api.step_data('Get downloaded SKP_VERSION', retcode=1)
   test += api.path.exists(
       api.path['slave_build'].join('skia'),
       api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
   )
   yield test