Refactor chromium.perf recipe configs.

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_apply_config, disable_tests,
-              gclient_config, platform, target_bits, tests):
-  return {
+def _BaseSpec(bot_type, chromium_config, disable_tests,
+              platform, target_bits, tests):
+  spec = {
     'bot_type': bot_type,
-    'chromium_apply_config' : chromium_apply_config,
-    'chromium_config': 'chromium_official',
+    'chromium_config': chromium_config,
     'chromium_config_kwargs': {
       'BUILD_CONFIG': 'Release',
       'TARGET_BITS': target_bits,
     },
     'disable_tests': disable_tests,
-    'gclient_config': gclient_config,
+    'gclient_config': 'chromium_perf',
     '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']
 
-def BuildSpec(perf_id, platform, target_bits):
+  return spec
+
+
+def BuildSpec(chromium_config, perf_id, platform, target_bits):
   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_apply_config=['mb', 'chromium_perf', 'goma_hermetic_fallback'],
+      chromium_config=chromium_config,
       disable_tests=True,
-      gclient_config='chromium',
       platform=platform,
       target_bits=target_bits,
       tests=tests)
 
-  if platform == 'android':
-    spec['chromium_apply_config'].append('android')
-    spec['chromium_config_kwargs']['TARGET_ARCH'] = 'arm'
-    spec['gclient_apply_config'] = ['android', 'perf']
-  else:
-    spec['compile_targets'] = ['chromium_builder_perf']
-    spec['gclient_apply_config'] = ['chrome_internal']
+  spec['compile_targets'] = ['chromium_builder_perf']
 
   return spec
 
 
-def _TestSpec(parent_builder, perf_id, platform, target_bits, max_battery_temp,
-              shard_index, num_host_shards, num_device_shards,
+def _TestSpec(chromium_config, parent_builder, perf_id, platform, target_bits,
+              max_battery_temp, shard_index, num_host_shards, num_device_shards,
               known_devices_file):
   spec = _BaseSpec(
       bot_type='tester',
-      chromium_apply_config=['chromium_perf'],
+      chromium_config=chromium_config,
       disable_tests=platform == 'android',
-      gclient_config='perf',
       platform=platform,
       target_bits=target_bits,
       tests=[steps.DynamicPerfTests(
         perf_id, platform, target_bits, max_battery_temp=max_battery_temp,
         num_device_shards=num_device_shards, num_host_shards=num_host_shards,
         shard_index=shard_index, known_devices_file=known_devices_file)],
   )
 
   spec['parent_buildername'] = parent_builder
   spec['perf-id'] = perf_id
   spec['results-url'] = 'https://chromeperf.appspot.com'
 
-  if platform == 'android':
-    spec['android_config'] = 'perf'
-    spec['chromium_config_kwargs']['TARGET_PLATFORM'] = 'android'
-    spec['gclient_apply_config'] = ['android']
-  else:
+  if platform != 'android':
+    # TODO: Remove disable_tests and run test_generators on Android.
     spec['test_generators'] = [steps.generate_script]
     spec['test_spec_file'] = 'chromium.perf.json'
 
   return spec
 
 
 def _AddBuildSpec(name, platform, target_bits=64):
   if target_bits == 64:
     perf_id = platform
   else:
     perf_id = '%s-%d' % (platform, target_bits)
 
-  SPEC['builders'][name] = BuildSpec(perf_id, platform, target_bits)
+  SPEC['builders'][name] = BuildSpec(
+      'chromium_perf', perf_id, platform, target_bits)
   assert target_bits not in _builders[platform]
   _builders[platform][target_bits] = name
 
 
 def _AddTestSpec(name, perf_id, platform, target_bits=64,
                  max_battery_temp=350, num_host_shards=1, num_device_shards=1,
                  known_devices_file='.known_devices'):
   parent_builder = _builders[platform][target_bits]
   for shard_index in xrange(num_host_shards):
     builder_name = '%s (%d)' % (name, shard_index + 1)
     SPEC['builders'][builder_name] = _TestSpec(
-        parent_builder, perf_id, platform, target_bits, max_battery_temp,
-        shard_index, num_host_shards, num_device_shards, known_devices_file)
+        'chromium_perf', parent_builder, perf_id, platform, target_bits,
+        max_battery_temp, shard_index, num_host_shards, num_device_shards,
+        known_devices_file)
 
 
 _AddBuildSpec('Android Builder', 'android', target_bits=32)
 _AddBuildSpec('Android arm64 Builder', 'android')
 _AddBuildSpec('Win Builder', 'win', target_bits=32)
 _AddBuildSpec('Win x64 Builder', 'win')
 _AddBuildSpec('Mac Builder', 'mac')
 _AddBuildSpec('Linux Builder', 'linux')
 
 
@@ skipping 38 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)