The second solution solution for ToT catapult.

scripts/slave/recipe_modules/chromium_tests/chromium_perf.py

 # Copyright 2015 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.
 
 import collections
 
 from . import steps
 
 
 _builders = collections.defaultdict(dict)
 
 
 SPEC = {
   'builders': {},
   'settings': {
     'build_gs_bucket': 'chrome-perf',
   },
 }
 
 
 def _BaseSpec(bot_type, chromium_config, disable_tests,
-              platform, target_bits, tests):
+              platform, target_bits, tests, gclient_config='chromium_perf'):

[dtu, 2016/08/10 01:19:39]

Don't think we need a new parameter, we don't have a case where chromium_config
is different from gclient_config. Maybe just rename chromium_config to
config_name or something like that.

[RobertoCN, 2016/08/10 22:59:54]

Done.

   spec = {
     'bot_type': bot_type,
     'chromium_config': chromium_config,
     'chromium_config_kwargs': {
       'BUILD_CONFIG': 'Release',
       'TARGET_BITS': target_bits,
     },
     'disable_tests': disable_tests,
-    'gclient_config': 'chromium_perf',
+    'gclient_config': gclient_config,
     'testing': {
       'platform': 'linux' if platform == 'android' else platform,
     },
     'tests': tests,
   }
 
   if platform == 'android':
     spec['android_config'] = 'chromium_perf'
     spec['chromium_apply_config'] = ['android']
     spec['chromium_config_kwargs']['TARGET_ARCH'] = 'arm'
     spec['chromium_config_kwargs']['TARGET_PLATFORM'] = 'android'
     spec['gclient_apply_config'] = ['android']
 
   return spec
 
 
-def BuildSpec(chromium_config, perf_id, platform, target_bits):
+def BuildSpec(chromium_config, perf_id, platform, target_bits,
+              gclient_config='chromium_perf'):
   if platform == 'android':
     # TODO: Run sizes on Android.
     tests = []
   else:
     tests = [steps.SizesStep('https://chromeperf.appspot.com', perf_id)]
 
   spec = _BaseSpec(
       bot_type='builder',
       chromium_config=chromium_config,
       disable_tests=True,
       platform=platform,
       target_bits=target_bits,
-      tests=tests)
+      tests=tests,
+      gclient_config=gclient_config,
+  )
 
   spec['compile_targets'] = ['chromium_builder_perf']
 
   return spec
 
 
 def _TestSpec(chromium_config, parent_builder, perf_id, platform, target_bits,
               max_battery_temp, shard_index, num_host_shards,
               num_device_shards):
   spec = _BaseSpec(
@@ skipping 89 matching lines @@
 _AddTestSpec('Mac 10.10 Perf', 'chromium-rel-mac10', 'mac',
              num_host_shards=5)
 _AddTestSpec('Mac Retina Perf', 'chromium-rel-mac-retina', 'mac',
              num_host_shards=5)
 _AddTestSpec('Mac HDD Perf', 'chromium-rel-mac-hdd', 'mac',
              num_host_shards=5)
 
 
 _AddTestSpec('Linux Perf', 'linux-release', 'linux',
              num_host_shards=5)