Convert swarm_triggered to OS specific builder.

projects.py

 # 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.
 """Define the supported projects."""
 
 import json
 import logging
 import os
 import re
 import sys
@@ skipping 396 matching lines @@
       'unit_tests',
     )
 
     # pylint: disable=W0612
     swarm_test_map = dict(
       (test, test + '_swarm') for test in swarm_enabled_tests)
 
     # Commenting out the items below will make the CQ not use swarm for its
     # execution. Uncomment to make the CQ use Swarming again.
     swarm_enabled_builders_and_tests = {
-      #'linux_rel': swarm_test_map,
-      # 'mac_rel': swarm_test_map,
-      # 'win_rel': swarm_test_map,
+      ('linux_rel', 'linux_swarm_triggered'): swarm_test_map,
+      # ('mac_rel', 'mac_swarm_triggered'): swarm_test_map,
+      # ('win_rel', 'win_swarm_triggered'): swarm_test_map,
     }
 
     step_verifiers += [
       try_job_steps.TryJobSteps(
           builder_name=b, prereq_builder=prereq_builder,
           prereq_tests=prereq_tests, steps=s)
       for b, s in builders_and_tests.iteritems()
       if b not in swarm_enabled_builders_and_tests
     ] + [
       try_job_steps.TryJobTriggeredSteps(
         builder_name='android_dbg_triggered_tests',
         trigger_name='android_dbg',
         prereq_builder=prereq_builder,
         prereq_tests=prereq_tests,
         steps={'slave_steps': 'slave_steps'}),
     ]
 
     # Add the swarm enabled builders with swarm accepted tests.
-    for builder, builder_swarm_enabled_tests in (
+    for (builder, triggered), builder_swarm_enabled_tests in (
         swarm_enabled_builders_and_tests.iteritems()):
       regular_tests = list(set(builders_and_tests[builder]) -
                            set(builder_swarm_enabled_tests))
 
       step_verifiers.append(
           try_job_steps.TryJobTriggeredOrNormalSteps(
-              builder_name='swarm_triggered',
+              builder_name=triggered,
               trigger_name=builder,
               prereq_builder=prereq_builder,
               prereq_tests=prereq_tests,
               steps=builder_swarm_enabled_tests,
               trigger_bot_steps=regular_tests,
               use_triggered_bot=False))
 
   verifiers.append(try_job_on_rietveld.TryRunnerRietveld(
       context_obj,
       'http://build.chromium.org/p/tryserver.chromium/',
@@ skipping 285 matching lines @@
   """List the projects that can be managed by the commit queue."""
   return sorted(
       x[5:] for x in dir(sys.modules[__name__]) if x.startswith('_gen_'))
 
 
 def load_project(project, user, root_dir, rietveld_obj, no_try):
   """Loads the specified project."""
   assert os.path.isabs(root_dir)
   return getattr(sys.modules[__name__], '_gen_' + project)(
       user, root_dir, rietveld_obj, no_try)