Add bot config for Android component builder.

build/android/buildbot/bb_run_bot.py

 #!/usr/bin/env python
 #
 # Copyright (c) 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.
 
 import collections
 import copy
 import json
 import optparse
 import os
 import pipes
 import subprocess
 import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 from pylib import buildbot_report
 
 CHROME_SRC = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 
 GLOBAL_SLAVE_PROPS = {}
 
 BotConfig = collections.namedtuple(
-    'BotConfig', ['bot_id', 'bash_funs', 'test_obj', 'slave_props'])
+    'BotConfig',
+    ['bot_id', 'bash_funs', 'test_obj', 'slave_props', 'factory_properties'])
 TestConfig = collections.namedtuple('Tests', ['tests', 'extra_args'])
 Command = collections.namedtuple(
     'Command', ['step_name', 'command', 'testing_cmd'])
 
 
 def GetCommands(options, bot_config):
   """Get a formatted list of commands.
 
   Args:
     options: Options object.
     bot_config: A BotConfig named tuple.
   Returns:
     list of Command objects.
   """
   slave_props = dict(GLOBAL_SLAVE_PROPS)
   if bot_config.slave_props:
     slave_props.update(bot_config.slave_props)
+  if bot_config.factory_properties:
+    options.factory_properties.update(bot_config.factory_properties)

[Isaac (away), 2013/04/18 22:35:59]

This is not the right code path...  factory_properties are properties from the
buildbot factory.  We do not update them here.

[Siva Chandra, 2013/04/18 22:48:58]

'extra_gyp_defines' need to be set in factory properties before they are passed
to bb_baseline_setup below. Where do you suggest I update the factory properties
that are passed as argument to bb_baseline_setup?

 
   property_args = [
       '--factory-properties=%s' % json.dumps(options.factory_properties),
       '--build-properties=%s' % json.dumps(options.build_properties),
       '--slave-properties=%s' % json.dumps(slave_props)]
 
   commands = []
   def WrapWithBash(command):
     """Wrap a bash command string with envsetup scripts."""
     return ['bash', '-exc', '; '.join([
@@ skipping 32 matching lines @@
   flakiness_server = '--upload-to-flakiness-server'
 
   B = BotConfig
   def T(tests, extra_args=None):
     return TestConfig(tests, extra_args)
 
   bot_configs = [
       # Main builders
       B('main-builder-dbg',
         ['bb_check_webview_licenses', 'bb_compile', 'bb_run_findbugs',
-         'bb_zip_build'], None, None),
+         'bb_zip_build'], None, None, None),
       B('main-builder-rel',
-        ['bb_compile', 'bb_zip_build'], None, None),
-      B('main-clang-builder', compile_step, None, None),
-      B('main-clobber', compile_step, None, None),
+        ['bb_compile', 'bb_zip_build'], None, None, None),
+      B('main-clang-builder', compile_step, None, None, None),
+      B('main-clobber', compile_step, None, None, None),
       B('main-tests', std_test_steps, T(std_tests, [flakiness_server]),
+        None, None),
+
+      # Other waterfalls
+      B('asan-builder', std_build_steps, None, None, None),
+      B('asan-tests', std_test_steps + ['bb_asan_tests_setup'],
+        T(std_tests, ['--asan']), None, None),
+      B('chromedriver-fyi-tests-dbg', std_test_steps, T(['chromedriver']),
+        None, None),
+      B('fyi-builder-dbg',
+        ['bb_check_webview_licenses', 'bb_compile', 'bb_compile_experimental',
+         'bb_run_findbugs', 'bb_zip_build'], None, None, None),
+      B('fyi-builder-rel',
+        ['bb_compile', 'bb_compile_experimental', 'bb_zip_build'], None, None,
+        None),
+      B('fyi-tests', std_test_steps,
+        T(std_tests, ['--experimental', flakiness_server]), None, None),
+      B('fyi-component-builder-dbg', compile_step,
+        T(std_tests, ['--experimental', flakiness_server]), None,
+        {'extra_gyp_defines' : 'component=shared_library'}),
+      B('perf-tests-rel', std_test_steps, T([], ['--install=ContentShell']),
+        None, None),
+      B('webkit-latest-webkit-tests', std_test_steps,
+        T(['webkit_layout', 'webkit']), None, None),
+      B('webkit-latest-contentshell', compile_step, T(['webkit_layout']), None,
         None),
 
-      # Other waterfalls
-      B('asan-builder', std_build_steps, None, None),
-      B('asan-tests', std_test_steps + ['bb_asan_tests_setup'],
-        T(std_tests, ['--asan']), None),
-      B('chromedriver-fyi-tests-dbg', std_test_steps, T(['chromedriver']),
-        None),
-      B('fyi-builder-dbg',
-        ['bb_check_webview_licenses', 'bb_compile', 'bb_compile_experimental',
-         'bb_run_findbugs', 'bb_zip_build'], None, None),
-      B('fyi-builder-rel',
-        ['bb_compile', 'bb_compile_experimental', 'bb_zip_build'], None, None),
-      B('fyi-tests', std_test_steps,
-        T(std_tests, ['--experimental', flakiness_server]), None),
-      B('perf-tests-rel', std_test_steps,
-        T([], ['--install=ContentShell']),
-        None),
-      B('webkit-latest-webkit-tests', std_test_steps,
-        T(['webkit_layout', 'webkit']), None),
-      B('webkit-latest-contentshell', compile_step, T(['webkit_layout']), None),
-
       # Generic builder config (for substring match).
-      B('builder', std_build_steps, None, None),
+      B('builder', std_build_steps, None, None, None),
   ]
 
   bot_map = dict((config.bot_id, config) for config in bot_configs)
 
   # These bots have identical configuration to ones defined earlier.
   copy_map = [
       ('lkgr-clobber', 'main-clobber'),
       ('try-builder-dbg', 'main-builder-dbg'),
       ('try-builder-rel', 'main-builder-rel'),
       ('try-clang-builder', 'main-clang-builder'),
@@ skipping 81 matching lines @@
           cwd=CHROME_SRC,
           env=dict(os.environ, BUILDBOT_TESTING='1'))
     else:
       return_code = subprocess.call(command, cwd=CHROME_SRC, env=env)
     if return_code != 0:
       return return_code
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))