Add split builder/tester android trybot target

masters/master.tryserver.chromium/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 # Copyright (c) 2012 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.
 
 # READ THIS:
 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure
 
+from buildbot.scheduler import Triggerable
+
 # These modules come from scripts, which must be in the PYTHONPATH.
 from master import master_utils
 from master import slaves_list
 from master.builders_pools import BuildersPools
 from master.factory import chromium_factory, chromeos_factory
 from master.try_job_http import TryJobHTTP
 from master.try_job_rietveld import TryJobRietveld
 from master.try_job_svn import TryJobSubversion
 
 import config
@@ skipping 55 matching lines @@
   for req in requests:
     if any(c.who == 'commit-bot@chromium.org' for c in req.source.changes):
       return req
   return requests[0]
 
 
 def CreateBuilder(platform, builder_name, target,
                   tests=None, options=None, mode=None, timeout=2400,
                   slavebuilddir=None, extra_gyp_defines=None,
                   gclient_env=None, gyp_generators=None,
-                  factory_properties=None):
+                  factory_properties=None, annotation_script=None):
   """Generates and register a builder along with its slave(s)."""
-  if platform not in ('win32', 'win64', 'linux', 'mac',
-                      'android', 'android_test'):
+  if platform not in ('win32', 'win64', 'linux', 'mac', 'android'):
     raise Exception(platform + ' is not a known os type')
 
   factory_properties = (factory_properties or {}).copy()
 
   factory_properties.setdefault('non_default', [
       'check_licenses',
       'courgette_unittests',
       'googleurl_unittests',
       'pyauto_functional_tests',
       'sandbox_linux_unittests',
       'sync_integration_tests',
     ])
   factory_properties['gclient_env'] = {'GYP_DEFINES': ''}
 
-  annotation_script = None
   project = None
   if platform in ('win32', 'win64'):
     factory = m_chromium_win
     if builder_name == 'win_aura':
       project = 'all.sln;aura_builder'
     elif builder_name == 'win_cf':
       project = 'all.sln;chromium_builder_win_cf'
     elif builder_name == 'win_gpu':
       if target == 'Debug':
         project = 'all.sln;chromium_gpu_debug_builder'
       else:
         project = 'all.sln;chromium_gpu_builder'
     else:
       project = 'all.sln'
     factory_properties['process_dumps'] = True
     factory_properties['gclient_env']['GYP_DEFINES'] = 'fastbuild=1'
     factory_properties['start_crash_handler'] = True
   elif platform == 'linux':
     factory = m_chromium_linux
     factory_properties['gclient_env']['GYP_DEFINES'] = 'fastbuild=1'
   elif platform == 'android':
     factory = m_chromium_android
-    annotation_script = 'src/build/android/buildbot_try_compile.sh'
-  elif platform == 'android_test':
-    factory = m_chromium_android
-    annotation_script = 'src/build/android/buildbot_try_compile_test.sh'
   elif platform == 'mac':
     factory = m_chromium_mac
     factory_properties['gclient_env']['GYP_DEFINES'] = 'fastbuild=1'
 
   if gclient_env:
     factory_properties['gclient_env'].update(gclient_env)
   if extra_gyp_defines:
     factory_properties['gclient_env']['GYP_DEFINES'] += ' ' + extra_gyp_defines
   if gyp_generators:
     factory_properties['gclient_env']['GYP_GENERATORS'] = gyp_generators
@@ skipping 464 matching lines @@
       ],
       factory_properties={
         'gclient_env': {
           'GYP_DEFINES': ('chromeos=1 fastbuild=1'
                           ' ffmpeg_branding=ChromeOS'
                           ' dcheck_always_on=1'
                           ' component=shared_library'
                           ' proprietary_codecs=1')}})
 }
 
-b_android = CreateBuilder(platform='android',
-                          target='Release',
-                          builder_name='android')
+# Compile only trybot
+b_android = CreateBuilder(
+    platform='android',
+    target='Release',
+    builder_name='android',
+    annotation_script='src/build/android/buildbot_try_compile.sh')
 
-b_android_test = CreateBuilder(platform='android_test',
-                               target='Release',
-                               builder_name='android_test')
+# Compile and run tests
+b_android_test = CreateBuilder(
+    platform='android',
+    target='Release',
+    builder_name='android_test',
+    annotation_script='src/build/android/buildbot_try_compile_test.sh')
+
+# Compile and zip build, triggers android_tester
+b_android_builder = CreateBuilder(
+    platform='android',
+    target='Release',
+    builder_name='android_builder',
+    factory_properties={'trigger': 'android'},
+    annotation_script='src/build/android/buildbot_try_builder.sh')
+
+# Download and extract build, run tests.
+b_android_tester = CreateBuilder(
+    platform='android',
+    target='Release',
+    builder_name='android_tester',
+    factory_properties={'halt_on_missing_build': True},
+    annotation_script='src/build/android/buildbot_try_tester.sh')
 
 # 32 bits tools can't link libwebcore.a anymore due to lack of virtual address
 # space, including OSX 10.5.
 valgrind_gyp_defines = (
     chromium_factory.ChromiumFactory.MEMORY_TOOLS_GYP_DEFINES + ' enable_svg=0')
 drmemory_gyp_defines = chromium_factory.ChromiumFactory.DR_MEMORY_GYP_DEFINES
 
 b_valgrind_linux = {
   'name': 'linux_valgrind',
   'factory': m_chromium_linux.ChromiumFactory(
@@ skipping 693 matching lines @@
       'arm_thumb=1 '
       'arm_neon=0 '
       'arm_fpu=vfpv3-d16 '
       'chromeos=1 '  # Since this is the intersting variation.
   ),
 }
 
 c['builders'] = [
   b_linux_rel, b_linux_rel_alt, b_mac_rel, b_win_rel,
   b_linux_clang,
-  b_linux, b_mac, b_win, b_android, b_android_test,
+  b_linux, b_mac, b_win,
+  b_android, b_android_test, b_android_builder, b_android_tester,
   b_win_vs2010_rel, b_win_vs2010,
   b_chromium_chromiumos,
   b_valgrind_linux, b_valgrind_mac,
   b_chromium_chromiumos_valgrind,
   b_tsan_linux, b_drmemory_win,
   b_linux_layout, b_mac_layout, b_win_layout,
   b_linux_layout_rel, b_mac_layout_rel, b_win_layout_rel,
   b_coverage_linux,
   b_win_chrome_frame,
   b_mac_no_goma, b_linux_clang_no_goma,
@@ skipping 60 matching lines @@
       project='chrome'))
 
 if LISTEN_TO_SVN:
   c['schedulers'].append(TryJobSubversion(
       name='try_job_svn',
       svn_url=ActiveMaster.svn_url,
       last_good_urls=last_good_urls,
       code_review_sites=code_review_sites,
       pools=pools))
 
+# Triggerable scheduler for Android Builder.
+c['schedulers'].append(Triggerable(
+    name='android',
+    builderNames=['android_tester']))
 
 ####### STATUS TARGETS
 
 # Adds common status and tools to this master.
 # Use our own mail notifier.
 master_utils.AutoSetupMaster(c, ActiveMaster, False,
                              public_html='../master.chromium/public_html',
                              templates=['./templates',
                                         '../master.chromium/templates'])
 
@@ skipping 59 matching lines @@
 ####### PROJECT IDENTITY
 
 # The 'projectURL' string will be used to provide a link
 # from buildbot HTML pages to your project's home page.
 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage'
 
 # Buildbot master url:
 c['buildbotURL'] = 'http://build.chromium.org/p/tryserver.chromium/'
 
 # vi: set ts=4 sts=2 sw=2 et: