Split swarm_triggered into 3 builders to make it easier on devs.

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
 
 import socket
@@ skipping 463 matching lines @@
 
 b_linux_rel = CreateBuilder(
     platform='linux',
     target='Release',
     goma=True,
     options=linux_targets,
     tests=linux_tests + ['sizes_br'],
     builder_name='linux_rel',
     slavebuilddir='linux',
     factory_properties={
+      'triggered_builder': 'linux_swarm_triggered',
       'use_xvfb_on_linux': True,
     },
     run_default_swarm_tests=[
       'base_unittests',
       'browser_tests',
       'interactive_ui_tests',
       'net_unittests',
       'unit_tests',
     ])
 
@@ skipping 119 matching lines @@
 
 b_mac_rel = CreateBuilder(
     platform='mac',
     target='Release',
     options=mac_targets,
     tests=mac_tests + ['sizes_br'],
     builder_name='mac_rel',
     slavebuilddir='mac',
     goma=True,
     clang=True,
+    factory_properties={
+      'triggered_builder': 'mac_swarm_triggered',
+    },
     run_default_swarm_tests=[
       'base_unittests',
       'browser_tests',
       'interactive_ui_tests',
       'net_unittests',
       'unit_tests',
     ])
 
 b_mac_rel_naclmore = CreateBuilder(
     platform='mac',
@@ skipping 94 matching lines @@
     target='Release',
     platform='win32',
     options=win_targets,
     tests=win_tests + ['sizes_br'],
     builder_name='win_rel',
     slavebuilddir='win',
     factory_properties={
       'gclient_env': {
         'GYP_GENERATOR_FLAGS': 'msvs_error_on_missing_sources=1',
       },
+      'triggered_builder': 'win_swarm_triggered',
     },
     goma=True,
     run_default_swarm_tests=[
       'base_unittests',
       'browser_tests',
       'interactive_ui_tests',
       'net_unittests',
       'unit_tests',
     ])
 
@@ skipping 857 matching lines @@
       'chrome_frame_tests',
     ],
     slavebuilddir='win',
     factory_properties={
       'gclient_env': {
         'GYP_DEFINES': 'fastbuild=0',
       },
     })
 
 # Swarm Builder
-b_swarm = {
+b_swarms = [
+  {
     'auto_reboot': False,
     'factory': swarm_factory.SwarmTestBuilder(
         config.Master.swarm_server_internal_url,
+        config.Master.swarm_hashtable_server_internal,
+        tests=[
+          'base_unittests',
+          'browser_tests',
+          'interactive_ui_tests',
+          'net_unittests',
+          'sync_integration_tests',
+          'unit_tests',
+        ]),
+    'name': '%s_swarm_triggered' % name,
+  } for name in ('linux', 'mac', 'win')
+] + [
+  # TODO(maruel): Temporary to ease the transition; to be deleted around
+  # 2013-10-28.
+  {
+    'auto_reboot': False,
+    'factory': swarm_factory.SwarmTestBuilder(
+        config.Master.swarm_server_internal_url,
         config.Master.swarm_hashtable_server_internal,
         tests=[
           'base_unittests',
           'browser_tests',
           'interactive_ui_tests',
           'net_unittests',
           'sync_integration_tests',
           'unit_tests',
         ]),
     'name': 'swarm_triggered',
-}
+  }
+]
+
 
 # Clang builders
 b_linux_clang = CreateBuilder(
     platform='linux',
     target='Debug',
     options=linux_targets,
     tests=linux_tests,
     builder_name='linux_clang',
     goma=True,
     clang=True,
@@ skipping 524 matching lines @@
   b_linux_arm_tester,
   b_valgrind_linux, b_valgrind_mac,
   b_linux_chromeos_valgrind,
   b_tsan_linux, b_tsan_win, 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_linux_layout_asan, b_linux_layout_rel_32,
   b_mac_layout_rel_lion, b_mac_layout_rel_mountainlion,
   b_coverage_linux,
   b_win_chrome_frame,
-  b_swarm,
+] + b_swarms + [
   b_linux_chromeos_clang,
   b_linux_futura, b_linux_aura, b_win7_aura, b_win8_aura,
   b_linux_asan, b_linux_browser_asan, b_linux_clang_tsan,
   b_linux_chromeos_asan,
   b_mac_asan, b_mac_xcodebuild,
   b_linux_heapcheck,
   b_linux_redux,
   b_cros_pfq_x86, b_cros_pfq_amd64, b_cros_pfq_daisy,
   b_linux_nacl_sdk, b_win_nacl_sdk, b_mac_nacl_sdk,
   b_linux_nacl_sdk_build, b_win_nacl_sdk_build, b_mac_nacl_sdk_build,
@@ skipping 72 matching lines @@
     name='android_dbg',
     builderNames=['android_dbg_triggered_tests']))
 c['schedulers'].append(Triggerable(
     name='android_rel',
     builderNames=['android_rel_triggered_tests']))
 c['schedulers'].append(Triggerable(
     name='android_fyi_dbg',
     builderNames=['android_fyi_dbg_triggered_tests']))
 
 # Triggerable scheduler for Swarm Tests.
-c['schedulers'].append(Triggerable(
-    name='swarm_triggered',
-    builderNames=['swarm_triggered']))
+for name in ('linux', 'mac', 'win'):
+  c['schedulers'].append(Triggerable(
+      name='%s_swarm_triggered' % name,
+      builderNames=['%s_swarm_triggered' % name]))
 
 # Triggerable scheduler for linux arm
 c['schedulers'].append(Triggerable(
     name='linux_arm',
     builderNames=['linux_arm_tester']))
 
 
 ####### STATUS TARGETS
 
 # Adds common status and tools to this master.
@@ skipping 73 matching lines @@
 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage'
 
 # Buildbot master url:
 if ActiveMaster.is_production_host:
   c['buildbotURL'] = 'http://build.chromium.org/p/tryserver.chromium/'
 else:
   c['buildbotURL'] = 'http://%s:%d/' % (
       socket.getfqdn(), ActiveMaster.master_port)
 
 # vi: set ts=4 sts=2 sw=2 et: