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

masters/master.tryserver.chromium/master.cfg

Index: masters/master.tryserver.chromium/master.cfg
diff --git a/masters/master.tryserver.chromium/master.cfg b/masters/master.tryserver.chromium/master.cfg
index f96bb89bc0ed736d5c72680f3892ee2503e30aa1..dd44295b5648b1d4d7681c238b7a7fce05fe60b2 100644
--- a/masters/master.tryserver.chromium/master.cfg
+++ b/masters/master.tryserver.chromium/master.cfg
@@ -99,9 +99,10 @@ def NextJob(builder, requests):
 
 
 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):
@@ -174,10 +175,6 @@ def CreateBuilder(platform, builder_name, target,
                                         '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
@@ -344,6 +341,7 @@ 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})
@@ -352,6 +350,7 @@ b_linux_futura = CreateBuilder(
     platform='linux',
     target='Release',
     goma=True,
+    options=['chromium_builder_tests'],
     tests=linux_tests,
     builder_name='linux_futura',
     factory_properties={
@@ -435,6 +434,7 @@ b_linux_rel = CreateBuilder(
     platform='linux',
     target='Release',
     goma=True,
+    options=['chromium_builder_tests'],
     tests=linux_tests + ['sizes'],
     builder_name='linux_rel',
     slavebuilddir='linux',
@@ -447,6 +447,7 @@ b_linux_rel_naclmore = CreateBuilder(
     platform='linux',
     target='Release',
     goma=True,
+    options=['nacl_integration'],

[M-A Ruel, 2012/11/08 16:39:09]

Brad|Mark, no need to build anything else from what I understand?

In fact, I don't know what this builder exists; it could be replaced on a
PRESUBMIT.py with:
return ['linux_rel:nacl_integration']
and if another linux_rel is specified, this step will simply be added to the
default tests so it's not a problem.

     tests=['nacl_integration'],
     builder_name='linux_rel_naclmore',
     slavebuilddir='linux',
@@ -456,6 +457,7 @@ 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',
@@ -468,6 +470,7 @@ 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',
@@ -531,6 +534,7 @@ mac_tests = [
 b_mac = CreateBuilder(
     platform='mac',
     target='Debug',
+    options=['chromium_builder_tests'],
     tests=mac_tests,
     builder_name='mac',
     goma=True,
@@ -542,6 +546,7 @@ 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,
@@ -551,6 +556,7 @@ b_mac_alt = CreateBuilder(
 b_mac_rel = CreateBuilder(
     platform='mac',
     target='Release',
+    options=['chromium_builder_tests'],
     tests=mac_tests + ['sizes'],
     builder_name='mac_rel',
     slavebuilddir='mac',
@@ -561,6 +567,7 @@ b_mac_rel = CreateBuilder(
 b_mac_rel_alt = CreateBuilder(
     platform='mac',
     target='Release',
+    options=['chromium_builder_tests'],
     tests=mac_tests + ['sizes'],
     builder_name='mac_rel_alt',
     slavebuilddir='mac',
@@ -571,6 +578,7 @@ b_mac_rel_alt = CreateBuilder(
 b_mac_rel_naclmore = CreateBuilder(
     platform='mac',
     target='Release',
+    options=['nacl_integration'],
     tests=['nacl_integration'],
     builder_name='mac_rel_naclmore',
     slavebuilddir='mac',
@@ -580,6 +588,7 @@ b_mac_rel_naclmore = CreateBuilder(
 b_mac_rel_naclmore_alt = CreateBuilder(
     platform='mac',
     target='Release',
+    options=['nacl_integration'],
     tests=['nacl_integration'],
     builder_name='mac_rel_naclmore_alt',
     slavebuilddir='mac',
@@ -645,6 +654,7 @@ win_tests = [
 b_win = CreateBuilder(
     target='Debug',
     platform='win32',
+    options=['chromium_builder_tests'],
     tests=win_tests,
     builder_name='win',
     factory_properties={
@@ -660,6 +670,7 @@ 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',
@@ -674,6 +685,7 @@ b_win_rel = CreateBuilder(
 b_win_rel_naclmore = CreateBuilder(
     target='Release',
     platform='win32',
+    options=['chromium_builder_tests'],
     tests=win_tests,
     builder_name='win_rel_naclmore',
     slavebuilddir='win',
@@ -766,6 +778,8 @@ 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',
@@ -776,6 +790,8 @@ 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,
@@ -786,6 +802,8 @@ 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',
@@ -798,6 +816,8 @@ 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,
@@ -808,6 +828,8 @@ 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)
 
@@ -1230,12 +1252,12 @@ b_win_layout_rel = {
 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': {
@@ -1261,6 +1283,7 @@ b_swarm = {
 b_linux_clang = CreateBuilder(
     platform='linux',
     target='Debug',
+    options=['chromium_builder_tests'],
     tests=linux_tests,
     builder_name='linux_clang',
     goma=True,
@@ -1296,6 +1319,7 @@ b_win_aura = CreateBuilder(
     platform='win32',
     target='Debug',
     builder_name='win_aura',
+    options=['aura_builder'],
     tests=[
       'ash_unittests',
       'aura',
@@ -1308,7 +1332,6 @@ b_win_aura = CreateBuilder(
       'unit_unit',
       'views',
     ],
-    options=['aura_builder'],
     goma=True,
     factory_properties={
       'sharded_tests': win_sharded,
@@ -1322,6 +1345,7 @@ b_win_ash = CreateBuilder(
     platform='win32',
     target='Debug',
     builder_name='win_ash',
+    options=['chromium_builder_tests'],

[M-A Ruel, 2012/11/08 16:39:09]

Peter, I'm not sure there. I can revert to 'all' instead to be safe.

[Peter Mayo, 2012/11/09 02:19:47]

Actually making this be aura_builder would cross something off my TODO list.

"win_ash should run the same tests that win_aura does, but in ash instead of on
the windows desktop. it doesn't do that now (because they don't even run without
failing on desktop)"

[M-A Ruel, 2012/11/09 23:23:19]

done

     tests=[
       'ash_unittests',
       'aura',
@@ -1416,6 +1440,7 @@ b_mac_asan = CreateBuilder(
     tests=mac_asan_tests,
     options=[
       '--disable-aslr',
+      'chromium_builder_tests',

[M-A Ruel, 2012/11/08 16:39:09]

Alexander, master.chromium.memory/master_mac_cfg.py uses a full list of the
targets to build, so I'm not sure if 'all' should be kept here. I'll revert to
'all' if unsure.

[Alexander Potapenko, 2012/11/08 16:47:24]

Let it be 'chromium_builder_tests'.

[M-A Ruel, 2012/11/08 16:51:09]

Ok thanks. Note that linux_asan is using the manual style to declare the builder
and it does list its targets. I'd prefer to keep fixing this outside of the
scope of this CL so it's just FYI.

     ],
     builder_name='mac_asan',
     slavebuilddir='mac_asan',
@@ -1435,6 +1460,7 @@ b_mac_asan_alt = CreateBuilder(
     tests=mac_asan_tests,
     options=[
       '--disable-aslr',
+      'chromium_builder_tests',
     ],
     builder_name='mac_asan_alt',
     slavebuilddir='mac_asan',
@@ -1584,6 +1610,7 @@ b_linux_gpu = CreateBuilder(
 b_win_gpu = CreateBuilder(
     target='Debug',
     platform='win32',
+    options=['chromium_gpu_debug_builder'],
     tests=[
       'gpu_tests',
       'gles2_conform_test',
@@ -1594,8 +1621,7 @@ b_win_gpu = CreateBuilder(
         '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',
@@ -1642,29 +1668,33 @@ nacl_sdk_script = 'nacl_sdk_buildbot_run.py'
 b_linux_nacl_sdk = CreateBuilder(
     platform='linux',
     target='Debug',
+    options=['chromium_builder_qa'],

[M-A Ruel, 2012/11/08 16:39:09]

Brad|Mark, I took that from master.client.nacl.sdk/master.cfg, is it fine?

     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},
@@ -1675,6 +1705,7 @@ b_mac_nacl_sdk_alt = CreateBuilder(
 b_linux_perf = CreateBuilder(
     platform='linux',
     target='Release',
+    options=['all'],

[M-A Ruel, 2012/11/08 16:39:09]

No idea if there's a meta-target for the perf targets so I stayed conservative
here.

     tests=[
       # From f_cr_rel_linux_lowmem in master.chromium.perf/master.cfg,
       'page_cycler_moz',
@@ -1702,6 +1733,7 @@ b_linux_perf = CreateBuilder(
 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',
@@ -1722,6 +1754,7 @@ b_win_perf = CreateBuilder(
 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',