Remove android_test trybot type

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
@@ skipping 79 matching lines @@
     'src/build',
     target_platform='darwin',
     full_checkout=True)
 
 m_win_swarm = swarm_factory.SwarmFactory(
     'src/build',
     target_platform='win32',
     full_checkout=True)
 
 # GS archive vars
-chromium_android_archive = master_config.GetGSUtilUrl('chromium-android',
-                                                      'android_try_builder')
+android_dbg_archive = master_config.GetGSUtilUrl(
+    'chromium-android', 'android_try_dbg')
+android_fyi_dbg_archive = master_config.GetGSUtilUrl(
+    'chromium-android', 'android_try_fyi_dbg')
 
 def NextJob(builder, requests):
   """Always prioritize commit queue jobs over try jobs."""
   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,
@@ skipping 594 matching lines @@
                           ' proprietary_codecs=1')}})
 }
 
 # Compile only trybot
 b_android = CreateBuilder(
     platform='android',
     target='Debug',
     builder_name='android',
     annotation_script='src/build/android/buildbot/bb_try_compile.sh')
 
-# Compile and run tests
-b_android_test = CreateBuilder(
+# Compile and zip build, triggers testers
+b_android_dbg = CreateBuilder(
     platform='android',
     target='Debug',
-    builder_name='android_test',
-    annotation_script='src/build/android/buildbot/bb_try_compile_test.sh')
-
-# Compile and zip build, triggers android_tester
-b_android_builder = CreateBuilder(
-    platform='android',
-    target='Debug',
-    builder_name='android_builder',
+    builder_name='android_dbg',
     factory_properties={'trigger': 'android',
-                        'build_url': chromium_android_archive},
+                        'build_url': android_dbg_archive},
     annotation_script='src/build/android/buildbot/bb_try_builder.sh')
 
 # Download and extract build, run tests.
-b_android_tester = CreateBuilder(
+b_android_dbg_triggered_tests = CreateBuilder(
     platform='android',
     target='Debug',
-    builder_name='android_tester',
+    builder_name='android_dbg_triggered_tests',
     factory_properties={'halt_on_missing_build': True,
-                        'build_url': chromium_android_archive},
+                        'build_url': android_dbg_archive},
     annotation_script='src/build/android/buildbot/bb_try_tester.sh')
 
+# Compile and zip build, triggers testers
+b_android_fyi_dbg = CreateBuilder(
+    platform='android',
+    target='Debug',
+    builder_name='android_fyi_dbg',
+    factory_properties={'trigger': 'android_fyi',
+                        'build_url': android_fyi_dbg_archive},
+    annotation_script='src/build/android/buildbot/bb_try_fyi_builder.sh')
+
+# Download and extract build, run tests.
+b_android_fyi_dbg_triggered_tests = CreateBuilder(
+    platform='android',
+    target='Debug',
+    builder_name='android_fyi_dbg_triggered_tests',
+    factory_properties={'halt_on_missing_build': True,
+                        'build_url': android_fyi_dbg_archive},
+    annotation_script='src/build/android/buildbot/bb_try_fyi_tester.sh')
+
 b_ios_rel_device = CreateBuilder(
   platform='ios',
   builder_name='ios_rel_device',
   target='Release',
   options=[
       '--',
       '-project', '../build/all.xcodeproj',
       '-sdk', 'iphoneos5.1',
       '-target', 'All',
   ],
@@ skipping 865 matching lines @@
       'arm_fpu=vfpv3-d16 '
       'chromeos=1 '  # Since this is the intersting variation.
   ),
 }
 
 c['builders'] = [
   b_linux_rel, b_linux_rel_alt, b_linux_rel_precise, b_mac_rel, b_win_rel,
   b_linux_rel_naclmore, b_mac_rel_naclmore, b_win_rel_naclmore,
   b_linux_clang,
   b_linux, b_mac, b_win,
-  b_android, b_android_test, b_android_builder, b_android_tester,
+  b_android, b_android_dbg, b_android_dbg_triggered_tests,
+  b_android_fyi_dbg, b_android_fyi_dbg_triggered_tests,
   b_ios_rel_device, b_ios_dbg_simulator,
   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,
@@ skipping 65 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.
+# Triggerable schedulers for Android Builder.
 c['schedulers'].append(Triggerable(
     name='android',
-    builderNames=['android_tester']))
+    builderNames=['android_dbg_triggered_tests']))
+c['schedulers'].append(Triggerable(
+    name='android_fyi',
+    builderNames=['android_fyi_dbg_triggered_tests']))
 
 
 ####### STATUS TARGETS
 
 # Adds common status and tools to this master.
 # Use our own mail notifier.
 master_utils.AutoSetupMaster(c, ActiveMaster, False)
 
 if MAIL_NOTIFIER:
   # Add a dumb MailNotifier first so it will be used for BuildSlave with
@@ skipping 57 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: