Add chromium android bot to FYI waterfall.

scripts/master/factory/chromium_factory.py

 # Copyright (c) 2011 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.
 
 """Utility class to build the chromium master BuildFactory's.
 
 Based on gclient_factory.py and adds chromium-specific steps."""
 
 import os
 import re
@@ skipping 158 matching lines @@
   if config.Master.trunk_internal_url:
     PYAUTO_DEPS.append(('src/chrome/test/data/plugin',
                         config.Master.trunk_internal_url +
                         '/data/chrome_plugin_tests'))
     PYAUTO_DEPS.append(('src/chrome/test/data/pyauto_private',
                         config.Master.trunk_internal_url +
                         '/data/pyauto_private'))
 
   def __init__(self, build_dir, target_platform=None, pull_internal=True,
                full_checkout=False, additional_svn_urls=None, name=None,
-               custom_deps_list=None):
+               custom_deps_list=None, nohooks_on_update=False):
     if full_checkout:
       needed_components = None
     else:
       needed_components = self.NEEDED_COMPONENTS
     main = gclient_factory.GClientSolution(config.Master.trunk_url_src,
                needed_components=needed_components,
                name=name,
                custom_deps_list=custom_deps_list,
                custom_vars_list=[self.CUSTOM_VARS_WEBKIT_MIRROR,
                                  self.CUSTOM_VARS_GOOGLECODE_URL,
                                  self.CUSTOM_VARS_SOURCEFORGE_URL])
     internal_custom_deps_list = [main]
     if config.Master.trunk_internal_url_src and pull_internal:
       internal = gclient_factory.GClientSolution(
                      config.Master.trunk_internal_url_src,
                      needed_components=self.NEEDED_COMPONENTS_INTERNAL)
       internal_custom_deps_list.append(internal)
 
     additional_svn_urls = additional_svn_urls or []
     for svn_url in additional_svn_urls:
       solution = gclient_factory.GClientSolution(svn_url)
       internal_custom_deps_list.append(solution)
 
     gclient_factory.GClientFactory.__init__(self, build_dir,
                                             internal_custom_deps_list,
-                                            target_platform=target_platform)
+                                            target_platform=target_platform,
+                                            nohooks_on_update=nohooks_on_update)
 
   def _AddTests(self, factory_cmd_obj, tests, mode=None,
                 factory_properties=None):
     """Add the tests listed in 'tests' to the factory_cmd_obj."""
     factory_properties = factory_properties or {}
     tests = (tests or [])[:]
 
     # This function is too crowded, try to simplify it a little.
     def R(test):
       if gclient_factory.ShouldRunTest(tests, test):
@@ skipping 307 matching lines @@
 
     test_parity_platform = factory_properties.get('test_parity_platform')
     if test_parity_platform:
       chromium_cmd_obj.AddSendTestParityStep(test_parity_platform)
 
     # Append any post steps needed by the BuildFactory.
     self.PostBuildFactory(factory, target=target, slave_type=slave_type,
                           factory_properties=factory_properties)
     return factory
 
+  def ChromiumAnnotationFactory(self, annotation_script,
+                                branch='master',
+                                target='Release',
+                                slave_type='AnnotatedBuilderTester',
+                                clobber=False,
+                                compile_timeout=6000,
+                                build_url=None,
+                                project=None,
+                                factory_properties=None, options=None,
+                                tests=None,
+                                gclient_deps=None):
+    """Annotation-driven Chromium buildbot factory.
+
+    Line a ChromiumFactory, but non-sync steps (compile, run tests)
+    are specified in a script that uses @@@BUILD_STEP descriptive
+    text@@@ style annotations.
+
+    Note new slave type AnnotatedBuilderTester; we don't want a
+    compile step added.
+    TODO(jrg): is a new slave type the right direction?
+    """
+    # Setup factory.
+    factory_properties = factory_properties or {}
+    options = options or {}
+    factory = self.BuildFactory(target, clobber,
+                                None, None, # tests_for_build, mode,
+                                slave_type, options, compile_timeout, build_url,
+                                project, factory_properties,
+                                gclient_deps=gclient_deps)
+
+    # Get the factory command object to create new steps to the factory.
+    chromium_cmd_obj = chromium_commands.ChromiumCommands(factory,
+                                                          target,
+                                                          self._build_dir,
+                                                          self._target_platform)
+
+    # Add the main build.
+    chromium_cmd_obj.AddAnnotationStep('build', annotation_script)
+
+    return factory
+
+
   def ReliabilityTestsFactory(self, platform='win'):
     """Create a BuildFactory to run a reliability slave."""
     factory = BuildFactory({})
     cmd_obj = chromium_commands.ChromiumCommands(factory,
                                                  'Release', '',
                                                  self._target_platform)
     cmd_obj.AddUpdateScriptStep()
     cmd_obj.AddReliabilityTests(platform=platform)
     return factory
 
@@ skipping 235 matching lines @@
     if 'cros_deps' not in [s.name for s in self._solutions]:
       self._solutions.append(gclient_factory.GClientSolution(
           config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps'))
     if 'asan.DEPS' not in [s.name for s in self._solutions]:
       self._solutions.append(gclient_factory.GClientSolution(
           'http://src.chromium.org/svn/trunk/deps/asan.DEPS',
           'asan.DEPS'))
     return self.ChromiumFactory(target, clobber, tests, mode, slave_type,
                                 options, compile_timeout, build_url, project,
                                 factory_properties)