Support swarming dimensions in src-side JSON buildbot files.

scripts/slave/recipe_modules/gpu/api.py

 # Copyright 2013 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.
 
 from recipe_engine.types import freeze
 from recipe_engine import recipe_api
 
 import common
 
 SIMPLE_TESTS_TO_RUN = freeze([
@@ skipping 501 matching lines @@
     if self.is_fyi_waterfall:
       tests.append(self._create_gtest(
           'gpu_unittests', chrome_revision, webkit_revision, enable_swarming,
           swarming_dimensions))
 
     # Remove empty entries as some tests may be skipped.
     tests = [test for test in tests if test]
 
     return tests
 
-  def _get_gpu_suffix(self, dimensions):
-    if dimensions is None:
-      return None
-
-    gpu_vendor_id = dimensions.get('gpu', '').split(':')[0].lower()
-    if gpu_vendor_id == '8086':
-      gpu_vendor = 'Intel'
-    # TODO(sergiyb): Mocking various vendors IDs is currently difficult as they
-    # are hard coded in the recipe. When we'll move the configs to an external
-    # json file read in a dedicated step whose data can be overriden, we should
-    # create tests for all GPUs and remove no-cover pragmas below.
-    elif gpu_vendor_id == '10de':  # pragma: no cover
-      gpu_vendor = 'NVIDIA'
-    elif gpu_vendor_id == '1002':  # pragma: no cover
-      gpu_vendor = 'ATI'
-    else:
-      gpu_vendor = '(%s)' % gpu_vendor_id  # pragma: no cover
-
-    os = dimensions.get('os', '')
-    if os.startswith('Mac'):
-      if dimensions.get('hidpi', '') == '1':
-        os_name = 'Mac Retina'
-      else:
-        os_name = 'Mac'
-    elif os.startswith('Windows'):  # pragma: no cover
-      os_name = 'Windows'
-    else:  # pragma: no cover
-      os_name = 'Linux'
-
-    return 'on %s GPU on %s' % (gpu_vendor, os_name)
-
   def _create_gtest(self, name, chrome_revision, webkit_revision,
                     enable_swarming, swarming_dimensions,
                     args=[], target_name=None):
     # The step test must end in 'test' or 'tests' in order for the results to
     # automatically show up on the flakiness dashboard.
     #
     # Currently all tests on the GPU bots follow this rule, so we can't add
     # code like in chromium/api.py, run_telemetry_test.
 
     target_name = target_name or name
     assert target_name.endswith('test') or target_name.endswith('tests')
 
     results_directory = self.m.path['slave_build'].join('gtest-results', name)
     return self.m.chromium_tests.steps.GPUGTestTest(
         name,
         xvfb=False,
         args=args,
         target_name=target_name,
         use_isolate=True,
         generate_json_file=True,
         results_directory=results_directory,
         revision=chrome_revision,
         webkit_revision=webkit_revision,
         master_class_name=self._master_class_name_for_testing,
         enable_swarming=enable_swarming,
-        swarming_dimensions=swarming_dimensions,
-        swarming_extra_suffix=self._get_gpu_suffix(swarming_dimensions))
+        swarming_dimensions=swarming_dimensions)
 
   def _create_telemetry_test(self, name, chrome_revision, webkit_revision,
                              enable_swarming, swarming_dimensions,
                              args=None, target_name=None,
                              extra_browser_args=None):
     test_args = ['-v']
     if args:
       test_args.extend(args)
     # --expose-gc allows the WebGL conformance tests to more reliably
     # reproduce GC-related bugs in the V8 bindings.
@@ skipping 20 matching lines @@
     benchmark_name = target_name or name
     prefix_args = [
       benchmark_name, '--show-stdout',
       '--browser=%s' % self.m.chromium.c.build_config_fs.lower() ]
     if enable_swarming:
       return self.m.chromium_tests.steps.SwarmingIsolatedScriptTest(
           name, args=prefix_args + test_args,
           target_name='telemetry_gpu_test',
           dimensions=swarming_dimensions,
           tags={'gpu_test:1'},
-          extra_suffix=self._get_gpu_suffix(swarming_dimensions),
           override_compile_targets=['telemetry_gpu_test_run'])
     else:
       return self.m.chromium_tests.steps.LocalIsolatedScriptTest(
           step_name, args=prefix_args + test_args,
           target_name='telemetry_gpu_test',
           override_compile_targets=['telemetry_gpu_test_run'])