Do not build 'all' on all the try builders by default.

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 81 matching lines @@
 
 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,
-                  tests=None, options=None,
+                  options, tests,
                   slavebuilddir=None,
-                  factory_properties=None, annotation_script=None,
+                  factory_properties=None,
+                  annotation_script=None,
                   ninja=True,
                   goma=False,
                   clang=False):
   """Generates and register a builder along with its slave(s)."""
   if platform not in ('win32', 'win64', 'linux', 'mac', 'android', 'ios'):
     raise Exception(platform + ' is not a known os type')
   assert tests is not None or annotation_script, (
       'Must either specify tests or use an annotation script')
 
   factory_properties = (factory_properties or {}).copy()
@@ skipping 51 matching lines @@
   # TODO(ilevy): The script should be changed to use the canonical value.
   factory_properties['extra_gyp_defines'] = (
       factory_properties['gclient_env']['GYP_DEFINES'])
 
   options = build_tool + ['--clobber-post-fail'] + (options or [])
 
   enable_swarm_tests = builder_name in ('linux', 'linux_rel', 'mac', 'mac_rel',
                                         'mac_alt', 'mac_rel_alt', 'win',
                                         'win_rel')
 
-  # Ensure that all targets are build when compiling with swarm enabled.
-  if enable_swarm_tests:
-    options.append('all')
-
   compile_timeout = 2400
   if annotation_script:
     # Note new slave type AnnotatedTrybot; we don't want a compile step added
     # in gclient_factory.py.
     # TODO(maruel): Support enable_swarm_tests
     builder_factory = factory.ChromiumAnnotationFactory(
         slave_type='AnnotatedTrybot', target=target, tests=tests,
         options=options,
         compile_timeout=compile_timeout,
         factory_properties=factory_properties,
@@ skipping 144 matching lines @@
   'unit_tests',
   'webkit_compositor_bindings_unittests',
   'webkit_lint',
   'webkit_unit_tests',
 ]
 
 b_linux = CreateBuilder(
     platform='linux',
     target='Debug',
     goma=True,
+    options=['chromium_builder_tests'],
     tests=linux_tests,
     builder_name='linux',
     factory_properties={'sharded_tests': linux_sharded})
 
 b_linux_futura = CreateBuilder(
     platform='linux',
     target='Release',
     goma=True,
+    options=['chromium_builder_tests'],
     tests=linux_tests,
     builder_name='linux_futura',
     factory_properties={
       'sharded_tests': linux_sharded,
       'gclient_env': {
         'GYP_DEFINES': 'use_aura=1',
       },
     },
     slavebuilddir='linux_aura')
 
@@ skipping 63 matching lines @@
     },
     slavebuilddir='linux_aura')
 
 
 pools['chrome'].append('linux')
 
 b_linux_rel = CreateBuilder(
     platform='linux',
     target='Release',
     goma=True,
+    options=['chromium_builder_tests'],
     tests=linux_tests + ['sizes'],
     builder_name='linux_rel',
     slavebuilddir='linux',
     factory_properties={
       'sharded_tests': linux_sharded,
       'use_xvfb_on_linux': True,
     })
 
 b_linux_rel_naclmore = CreateBuilder(
     platform='linux',
     target='Release',
     goma=True,
+    options=['nacl_integration'],
     tests=['nacl_integration'],
     builder_name='linux_rel_naclmore',
     slavebuilddir='linux',
     factory_properties={'use_xvfb_on_linux': True})
 
 b_linux_rel_alt = CreateBuilder(
     platform='linux',
     target='Release',
     goma=True,
+    options=['chromium_builder_tests'],
     tests=linux_tests + ['sizes'],
     builder_name='linux_rel_alt',
     slavebuilddir='linux',
     factory_properties={
       'use_xvfb_on_linux': True,
       'sharded_tests': linux_sharded,
     })
 
 b_linux_rel_precise = CreateBuilder(
     platform='linux',
     target='Release',
     goma=True,
+    options=['chromium_builder_tests'],
     tests=linux_tests + ['sizes'],
     builder_name='linux_rel_precise',
     slavebuilddir='linux_precise',
     factory_properties={
       'sharded_tests': linux_sharded,
       'use_xvfb_on_linux': True,
     })
 
 # Tests that are single-machine shard-safe on MacOS
 mac_sharded = [
@@ skipping 42 matching lines @@
   'test_shell',
   'unit',
   'webkit_compositor_bindings_unittests',
   #'webkit_lint',
   #'webkit_unit',
 ]
 
 b_mac = CreateBuilder(
     platform='mac',
     target='Debug',
+    options=['chromium_builder_tests'],
     tests=mac_tests,
     builder_name='mac',
     goma=True,
     clang=True,
     factory_properties={'sharded_tests': mac_sharded})
 
 pools['chrome'].append('mac')
 
 b_mac_alt = CreateBuilder(
     platform='mac',
     target='Debug',
+    options=['chromium_builder_tests'],
     tests=mac_tests,
     builder_name='mac_alt',
     goma=True,
     clang=True,
     factory_properties={'sharded_tests': mac_sharded})
 
 b_mac_rel = CreateBuilder(
     platform='mac',
     target='Release',
+    options=['chromium_builder_tests'],
     tests=mac_tests + ['sizes'],
     builder_name='mac_rel',
     slavebuilddir='mac',
     goma=True,
     clang=True,
     factory_properties={'sharded_tests': mac_sharded})
 
 b_mac_rel_alt = CreateBuilder(
     platform='mac',
     target='Release',
+    options=['chromium_builder_tests'],
     tests=mac_tests + ['sizes'],
     builder_name='mac_rel_alt',
     slavebuilddir='mac',
     goma=True,
     clang=True,
     factory_properties={'sharded_tests': mac_sharded})
 
 b_mac_rel_naclmore = CreateBuilder(
     platform='mac',
     target='Release',
+    options=['nacl_integration'],
     tests=['nacl_integration'],
     builder_name='mac_rel_naclmore',
     slavebuilddir='mac',
     goma=True,
     clang=True)
 
 b_mac_rel_naclmore_alt = CreateBuilder(
     platform='mac',
     target='Release',
+    options=['nacl_integration'],
     tests=['nacl_integration'],
     builder_name='mac_rel_naclmore_alt',
     slavebuilddir='mac',
     goma=True,
     clang=True)
 
 
 # Tests that are single-machine shard-safe on Windows
 win_sharded = [
   'base_unittests',
@@ skipping 44 matching lines @@
   'test_shell',
   'unit',
   'webkit_compositor_bindings_unittests',
   #'webkit_lint',
   #'webkit_unit',
 ]
 
 b_win = CreateBuilder(
     target='Debug',
     platform='win32',
+    options=['chromium_builder_tests'],
     tests=win_tests,
     builder_name='win',
     factory_properties={
       'sharded_tests': win_sharded,
       'gclient_env': {
         'GYP_GENERATOR_FLAGS': 'msvs_error_on_missing_sources=1',
       },
     },
     goma=True)
 
 pools['chrome'].append('win')
 
 b_win_rel = CreateBuilder(
     target='Release',
     platform='win32',
+    options=['chromium_builder_tests'],
     tests=win_tests + ['sizes'],
     builder_name='win_rel',
     slavebuilddir='win',
     factory_properties={
       'sharded_tests': win_sharded,
       'gclient_env': {
         'GYP_GENERATOR_FLAGS': 'msvs_error_on_missing_sources=1',
       },
     },
     goma=True)
 
 b_win_rel_naclmore = CreateBuilder(
     target='Release',
     platform='win32',
+    options=['chromium_builder_tests'],
     tests=win_tests,
     builder_name='win_rel_naclmore',
     slavebuilddir='win',
     goma=True,
     factory_properties={
       'gclient_env': {
         'GYP_GENERATOR_FLAGS': 'msvs_error_on_missing_sources=1',
       },
     })
 
@@ skipping 72 matching lines @@
                           ' ffmpeg_branding=ChromeOS'
                           ' component=shared_library'
                           ' proprietary_codecs=1')}})
 }
 
 # Compile and zip build, triggers testers
 b_android_dbg = CreateBuilder(
     platform='android',
     target='Debug',
     builder_name='android_dbg',
+    options=[],
+    tests=[],
     annotation_script='src/build/android/buildbot/bb_try_builder.sh',
     factory_properties={
         'trigger': 'android_dbg',
         'build_url': android_dbg_archive})
 
 # Download and extract build, run tests.
 b_android_dbg_triggered_tests = CreateBuilder(
     platform='android',
     target='Debug',
     builder_name='android_dbg_triggered_tests',
+    options=[],
+    tests=[],
     annotation_script='src/build/android/buildbot/bb_try_tester.sh',
     factory_properties={
         'halt_on_missing_build': True,
         'build_url': android_dbg_archive})
 
 # Compile and zip build, triggers testers
 b_android_fyi_dbg = CreateBuilder(
     platform='android',
     target='Debug',
     builder_name='android_fyi_dbg',
+    options=[],
+    tests=[],
     annotation_script='src/build/android/buildbot/bb_try_fyi_builder.sh',
     factory_properties={
         'trigger': 'android_fyi_dbg',
         'build_url': android_fyi_dbg_archive,
         'buildtool': 'ninja',
         })
 
 # Download and extract build, run tests.
 b_android_fyi_dbg_triggered_tests = CreateBuilder(
     platform='android',
     target='Debug',
     builder_name='android_fyi_dbg_triggered_tests',
+    options=[],
+    tests=[],
     annotation_script='src/build/android/buildbot/bb_try_fyi_tester.sh',
     factory_properties={
         'halt_on_missing_build': True,
         'build_url': android_fyi_dbg_archive})
 
 # Android clang ninja builder
 b_android_clang_dbg = CreateBuilder(
     platform='android',
     target='Debug',
     builder_name='android_clang_dbg',
+    options=[],
+    tests=[],
     annotation_script='src/build/android/buildbot/bb_try_clang_builder.sh',
     clang=True)
 
 b_ios_rel_device = CreateBuilder(
   platform='ios',
   builder_name='ios_rel_device',
   target='Release',
   options=[
     '--',
     '-project', '../build/all.xcodeproj',
@@ skipping 402 matching lines @@
         'webkit_lint',
         'webkit_unit',
       ]),
 }
 
 
 # Chrome Frame builder
 b_win_chrome_frame = CreateBuilder(
     platform='win32',
     target='Debug',
+    builder_name='win_cf',
+    options=['chromium_builder_win_cf'],
     tests=[
       'chrome_frame_net_tests',
       'chrome_frame_tests',
     ],
-    builder_name='win_cf',
-    options=['chromium_builder_win_cf'],
     slavebuilddir='win',
     factory_properties={
       'gclient_env': {
         'GYP_DEFINES': 'fastbuild=0',
       },
     })
 
 # Swarm Builder
 b_swarm = {
     'name': 'swarm_triggered',
     'factory': swarm_factory.SwarmTestBuilder(
         config.Master.swarm_server_internal_url,
         tests=[
           'base_unittests',
           'browser_tests',
           'net_unittests',
           'sync_integration_tests',
           'unit_tests',
         ]),
 }
 
 # Clang builders
 b_linux_clang = CreateBuilder(
     platform='linux',
     target='Debug',
+    options=['chromium_builder_tests'],
     tests=linux_tests,
     builder_name='linux_clang',
     goma=True,
     clang=True,
     # Keep all tests off by default.
     factory_properties={
       'non_default': linux_tests_full_name,
       'gclient_env': {
         'GYP_DEFINES': 'clang_use_chrome_plugins=1',
       },
@@ skipping 15 matching lines @@
                           ' clang=1 clang_use_chrome_plugins=1'
                           ' fastbuild=1'
                           ' ffmpeg_branding=ChromeOS proprietary_codecs=1'
                           ' component=shared_library')}})
 }
 
 b_win_aura = CreateBuilder(
     platform='win32',
     target='Debug',
     builder_name='win_aura',
+    options=['aura_builder'],
     tests=[
       'ash_unittests',
       'aura',
       'browser_tests',
       'compositor',
       'content_browsertests',
       'content_unittests',
       'device_unittests',
       'interactive_ui',
       'unit_unit',
       'views',
     ],
-    options=['aura_builder'],
     goma=True,
     factory_properties={
       'sharded_tests': win_sharded,
       'gclient_env': {
         'GYP_DEFINES': 'use_aura=1',
       },
     })
 
 # this matches the bot on the main waterfall soon
 b_win_ash = CreateBuilder(
     platform='win32',
     target='Debug',
     builder_name='win_ash',
+    options=['aura_builder'],
     tests=[
       'ash_unittests',
       'aura',
       'compositor',
       'views',
     ],
     goma=True,
     factory_properties={
       'gclient_env': {
         'GYP_DEFINES': 'use_ash=1',
@@ skipping 74 matching lines @@
 mac_asan_tests = list(
   set(mac_tests) - set(['nacl_integration'])
 )
 
 b_mac_asan = CreateBuilder(
     platform='mac',
     target='Release',
     tests=mac_asan_tests,
     options=[
       '--disable-aslr',
+      'chromium_builder_tests',
     ],
     builder_name='mac_asan',
     slavebuilddir='mac_asan',
     goma=True,
     clang=True,
     factory_properties={
       'sharded_tests': mac_sharded,
       'asan': True,
       'gclient_env': {
         'GYP_DEFINES': 'asan=1',
       },
     })
 
 b_mac_asan_alt = CreateBuilder(
     platform='mac',
     target='Release',
     tests=mac_asan_tests,
     options=[
       '--disable-aslr',
+      'chromium_builder_tests',
     ],
     builder_name='mac_asan_alt',
     slavebuilddir='mac_asan',
     goma=True,
     clang=True,
     factory_properties={
       'sharded_tests': mac_sharded,
       'asan': True,
       'gclient_env': {
         'GYP_DEFINES': 'asan=1',
@@ skipping 129 matching lines @@
     factory_properties={
       'gclient_env': {
         'GYP_DEFINES': 'internal_gles2_conform_tests=1',
       },
     },
     builder_name='linux_gpu')
 
 b_win_gpu = CreateBuilder(
     target='Debug',
     platform='win32',
+    options=['chromium_gpu_debug_builder'],
     tests=[
       'gpu_tests',
       'gles2_conform_test',
       'gl_tests',
     ],
     factory_properties={
       'gclient_env': {
         'GYP_DEFINES': 'internal_gles2_conform_tests=1',
       },
     },
-    builder_name='win_gpu',
-    options=['chromium_gpu_debug_builder'])
+    builder_name='win_gpu')
 
 b_mac_gpu = CreateBuilder(
     platform='mac',
     target='Debug',
     options=[
       'chromium_gpu_debug_builder',
     ],
     tests=[
       'gpu_tests',
       'gles2_conform_test',
@@ skipping 26 matching lines @@
     },
     builder_name='mac_gpu_retina',
     goma=True,
     clang=True)
 
 # NaCl SDK try bots
 nacl_sdk_script = 'nacl_sdk_buildbot_run.py'
 b_linux_nacl_sdk = CreateBuilder(
     platform='linux',
     target='Debug',
+    options=['chromium_builder_qa'],
     tests=['annotated_steps'],
-    factory_properties={'annotated_script':nacl_sdk_script},
+    factory_properties={'annotated_script': nacl_sdk_script},
     builder_name='linux_nacl_sdk',
     goma=True)
 b_win_nacl_sdk = CreateBuilder(
     target='Debug',
     platform='win32',
+    options=['chromium_builder_qa'],
     tests=['annotated_steps'],
-    factory_properties={'annotated_script':nacl_sdk_script},
+    factory_properties={'annotated_script': nacl_sdk_script},
     builder_name='win_nacl_sdk',
     slavebuilddir='win',
     goma=True)
 b_mac_nacl_sdk = CreateBuilder(
     platform='mac',
     target='Debug',
+    options=['chromium_builder_qa'],
     tests=['annotated_steps'],
     builder_name='mac_nacl_sdk',
-    factory_properties={'annotated_script':nacl_sdk_script},
+    factory_properties={'annotated_script': nacl_sdk_script},
     goma=True,
     clang=True)
 b_mac_nacl_sdk_alt = CreateBuilder(
     platform='mac',
     target='Debug',
+    options=['chromium_builder_qa'],
     tests=['annotated_steps'],
     builder_name='mac_nacl_sdk_alt',
     factory_properties={'annotated_script':nacl_sdk_script},
     goma=True,
     clang=True)
 
 # Perf try bots
 b_linux_perf = CreateBuilder(
     platform='linux',
     target='Release',
+    options=['all'],
     tests=[
       # From f_cr_rel_linux_lowmem in master.chromium.perf/master.cfg,
       'page_cycler_moz',
       'page_cycler_morejs',
       'page_cycler_intl1',
       'page_cycler_intl2',
       'page_cycler_dhtml',
       'page_cycler_database',
       'page_cycler_indexeddb',
       'startup',
       'dom_perf',
       'tab_switching',
       'memory',
       'sunspider',
       'v8_benchmark',
       'page_cycler_moz-http',
       'page_cycler_bloat-http',
       'page_cycler_2012Q2-netsim',
       'frame_rate',
       'sync',
     ],
     builder_name='linux_perf',
     goma=True)
 
 b_win_perf = CreateBuilder(
     platform='win32',
     target='Release',
+    options=['all'],
     tests=[
       # From f_cr_rel_perf_win7_jank in master.chromium.perf/master.cfg,
       'page_cycler_moz',
       'page_cycler_morejs',
       'page_cycler_intl1',
       'page_cycler_intl2',
       'page_cycler_dhtml',
       'page_cycler_database',
       'page_cycler_indexeddb',
       'startup',
       'sunspider',
       'v8_benchmark',
       'dromaeo',
     ],
     builder_name='win_perf',
     goma=True)
 
 b_mac_perf = CreateBuilder(
     platform='mac',
     target='Release',
+    options=['all'],
     tests=[
       # From f_cr_rel_mac6_perf_1 in master.chromium.perf/master.cfg,
       'page_cycler_moz',
       'page_cycler_morejs',
       'page_cycler_intl1',
       'page_cycler_intl2',
       'page_cycler_dhtml',
       'page_cycler_database',
       'page_cycler_indexeddb',
       'page_cycler_moz-http',
@@ skipping 210 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: