Chromium Code Reviews| Index: scripts/master/master_config.py |
| diff --git a/scripts/master/master_config.py b/scripts/master/master_config.py |
| index 254a6a1adade692a34e89f6a8e071c51acb25ef5..e9e5d9e50ec998533fb149fa62b2d3ffe55a5b4c 100644 |
| --- a/scripts/master/master_config.py |
| +++ b/scripts/master/master_config.py |
| @@ -2,10 +2,11 @@ |
| # Use of this source code is governed by a BSD-style license that can be |
| # found in the LICENSE file. |
| -from buildbot.scheduler import Dependent |
| -from buildbot.scheduler import Nightly |
| -from buildbot.scheduler import Scheduler |
| -from buildbot.scheduler import Triggerable |
| +from buildbot.schedulers.basic import SingleBranchScheduler |
|
kjellander_chromium
2013/01/25 11:05:42
I forgot to ask about this part since I was tempte
|
| +from buildbot.schedulers.dependent import Dependent |
| +from buildbot.schedulers.timed import Periodic |
| +from buildbot.schedulers.timed import Nightly |
| +from buildbot.schedulers.triggerable import Triggerable |
| from master import slaves_list |
| @@ -57,6 +58,14 @@ class Helper(object): |
| 'branch': branch, |
| 'hour': hour} |
| + def Periodic(self, name, periodicBuildTimer): |
| + """Helper method for the Periodic scheduler.""" |
| + if name in self._schedulers: |
| + raise ValueError('Scheduler %s already exists' % name) |
| + self._schedulers[name] = {'type': 'Periodic', |
| + 'builders': [], |
| + 'periodicBuildTimer': periodicBuildTimer} |
| + |
| def Dependent(self, name, parent): |
| if name in self._schedulers: |
| raise ValueError('Scheduler %s already exists' % name) |
| @@ -109,19 +118,20 @@ class Helper(object): |
| new_builder['builddir'] = builder['builddir'] |
| c['builders'].append(new_builder) |
| - # Process the main schedulers |
| + # Process the main schedulers. |
| for s_name in self._schedulers: |
| scheduler = self._schedulers[s_name] |
| if scheduler['type'] == 'Scheduler': |
| - instance = Scheduler(name=s_name, |
| - branch=scheduler['branch'], |
| - treeStableTimer=scheduler['treeStableTimer'], |
| - builderNames=scheduler['builders'], |
| - categories=scheduler['categories']) |
| + instance = SingleBranchScheduler( |
| + name=s_name, |
| + branch=scheduler['branch'], |
| + treeStableTimer=scheduler['treeStableTimer'], |
| + builderNames=scheduler['builders'], |
| + categories=scheduler['categories']) |
| scheduler['instance'] = instance |
| c['schedulers'].append(instance) |
| - # Process the dependent schedulers |
| + # Process the dependent schedulers. |
| for s_name in self._schedulers: |
| scheduler = self._schedulers[s_name] |
| if scheduler['type'] == 'Dependent': |
| @@ -130,14 +140,23 @@ class Helper(object): |
| self._schedulers[scheduler['parent']]['instance'], |
| scheduler['builders'])) |
| - # Process the triggerable schedulers |
| + # Process the triggerable schedulers. |
| for s_name in self._schedulers: |
| scheduler = self._schedulers[s_name] |
| if scheduler['type'] == 'Triggerable': |
| c['schedulers'].append(Triggerable(s_name, |
| scheduler['builders'])) |
| - # Process the nightly schedulers |
| + # Process the periodic schedulers. |
| + for s_name in self._schedulers: |
| + scheduler = self._schedulers[s_name] |
| + if scheduler['type'] == 'Periodic': |
| + c['schedulers'].append( |
| + Periodic(s_name, |
| + periodicBuildTimer=scheduler['periodicBuildTimer'], |
| + builderNames=scheduler['builders'])) |
| + |
| + # Process the nightly schedulers. |
| for s_name in self._schedulers: |
| scheduler = self._schedulers[s_name] |
| if scheduler['type'] == 'Nightly': |