From 1eb3845405f961735a03c0817fcb286e55b39ec7 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 22 Nov 2011 23:07:33 -0800 Subject: [PATCH] CI: Schedule each unit/acceptance pair by platform it is testing --- .../buildbot_config/master/schedulers.py | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/test/buildbot/buildbot_config/master/schedulers.py b/test/buildbot/buildbot_config/master/schedulers.py index ef9e98861..efcab64fb 100644 --- a/test/buildbot/buildbot_config/master/schedulers.py +++ b/test/buildbot/buildbot_config/master/schedulers.py @@ -9,16 +9,24 @@ from buildbot.schedulers.basic import ( SingleBranchScheduler) def get_schedulers(builders): - # Run the unit tests for master - unit_builders = [b.name for b in builders if "unit" in b.name] - master_unit = SingleBranchScheduler(name="master-unit", - change_filter=ChangeFilter(branch="master"), - treeStableTimer=60, - builderNames=unit_builders) + platforms = ["linux", "osx", "win"] + schedulers = [] - acceptance_builders = [b.name for b in builders if "acceptance" in b.name] - master_acceptance = Dependent(name="master-acceptance", - upstream=master_unit, - builderNames=acceptance_builders) + for platform in platforms: + platform_builders = [b for b in builders if platform in b.name] - return [master_unit, master_acceptance] + # Unit tests for this platform + unit_builders = [b.name for b in platform_builders if "unit" in b.name] + master_unit = SingleBranchScheduler(name="%s-master-unit" % platform, + change_filter=ChangeFilter(branch="master"), + treeStableTimer=60, + builderNames=unit_builders) + + acceptance_builders = [b.name for b in platform_builders if "acceptance" in b.name] + master_acceptance = Dependent(name="%s-master-acceptance" % platform, + upstream=master_unit, + builderNames=acceptance_builders) + + schedulers.extend([master_unit, master_acceptance]) + + return schedulers