Re-enable iOS testing

infra/bots/recipes/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 os
 import json
@@ skipping 122 matching lines @@
         'NexusPlayer':   ('fugu',       'NRD90R'),
         'Pixel':         ('sailfish',   'NMF25'),
         'PixelC':        ('dragon',     'NMF26C'),
         'PixelXL':       ('marlin',     'NMF25'),
       }[builder_cfg['model']]
       dimensions['device_type'] = device_type
       dimensions['device_os'] = device_os
     elif 'iOS' in builder_cfg['os']:
       # For iOS, the device type is a better dimension than CPU or GPU.
       dimensions['device'] = {
-        'iPad4': 'iPad4,1',
+        # TODO(stephana): Remove this temporary discrepancy between the bot name
+        # and device. When we expand iOS testing names and devices need to match
+        # again. 
+        'iPad4': 'iPad5,1',
       }[builder_cfg['model']]
       # TODO(borenet): Replace this hack with something better.
-      dimensions['os'] = 'iOS-9.2'
+      dimensions['os'] = 'iOS-9.3.1'
     elif builder_cfg['cpu_or_gpu'] == 'CPU':
       dimensions['gpu'] = 'none'
       dimensions['cpu'] = {
         'AVX':  'x86-64',
         'AVX2': 'x86-64-avx2',
         'SSE4': 'x86-64',
       }[builder_cfg['cpu_or_gpu_value']]
       if ('Win' in builder_cfg['os'] and
           builder_cfg['cpu_or_gpu_value'] == 'AVX2'):
         # AVX2 is not correctly detected on Windows. Fall back on other
@@ skipping 609 matching lines @@
           path_config='kitchen',
           revision='abc123',
           **gerrit_kwargs) +
       api.step_data(
           'upload new .isolated file for test_skia',
           stdout=api.raw_io.output('def456 XYZ.isolated')) +
       api.step_data(
           'upload new .isolated file for upload_dm_results_skia',
           stdout=api.raw_io.output('def456 XYZ.isolated'))
   )