Convert swarm_triggered to OS specific builder.
The try server is splitting up these builders so the CQ has to
adapt accordingly.
Reenable linux_swarm_triggered.
TBR=xusydoc@chromium.org
BUG=
Review URL: https://codereview.chromium.org/24633002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/commit-queue@230165 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/projects.py b/projects.py
index b10bbff..a32085b 100644
--- a/projects.py
+++ b/projects.py
@@ -414,9 +414,9 @@
# 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 += [
@@ -435,14 +435,14 @@
]
# 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,
