Chromium Code Reviews| Index: scripts/master/master_gen.py |
| diff --git a/scripts/master/master_gen.py b/scripts/master/master_gen.py |
| index 03327080d5d47699c7a2fba48196b11e81daf984..a9d7db275e6aebd026e6c31717791faf825bff25 100644 |
| --- a/scripts/master/master_gen.py |
| +++ b/scripts/master/master_gen.py |
| @@ -16,6 +16,7 @@ from common import chromium_utils |
| from master import gitiles_poller |
| from master import master_utils |
| +from master import repo_poller |
| from master import slaves_list |
| from master.factory import annotator_factory |
| @@ -137,7 +138,7 @@ def _ComputeSchedulers(builders): |
| scheduler_type = scheduler_values['type'] |
| builder_names = scheduler_to_builders[scheduler_name] |
| - if scheduler_type == 'git_poller': |
| + if scheduler_type in ('git_poller', 'repo_poller'): |
| schedulers.append(SingleBranchScheduler( |
| name=scheduler_name, |
| branch='master', |
| @@ -167,6 +168,17 @@ def _ComputeChangeSourceAndTagComparator(builders): |
| if v['type'] == 'git_poller')): |
| change_source.append(gitiles_poller.GitilesPoller(url)) |
| + for values in builders['schedulers'].values(): |
|
ghost stip (do not use)
2015/10/12 22:37:59
this is a confusing variable name. can you make it
danalbert
2015/10/12 22:58:24
Agreed that it could be a better name. Perhaps `sc
|
| + if values['type'] != 'repo_poller': |
| + continue |
|
ghost stip (do not use)
2015/10/12 22:37:59
I'd prefer to unify with the if v['type'] == 'git_
danalbert
2015/10/12 22:58:24
Not sure what you mean by this either. Are you jus
|
| + |
| + change_source.append(repo_poller.RepoPoller( |
| + repo_url=values['manifest_url'], |
|
danalbert
2015/10/12 22:58:24
FYI I'm also going to change the name of this para
|
| + manifest='manifest', |
| + repo_branches=[values.get('branch', None)], |
| + pollInterval=300, |
|
danalbert
2015/10/12 22:58:24
Should I pull out this and the `manifest` paramete
|
| + revlinktmpl='https://android.googlesource.com/platform/%s/+/%s')) |
|
ghost stip (do not use)
2015/10/12 22:37:59
whoa what? we should make the revlinktmpl configur
danalbert
2015/10/12 22:58:25
Oops! Will fix.
|
| + |
| # We have to set the tag_comparator to something, but if we have multiple |
| # repos, the tag_comparator will not work properly (it's meaningless). |
| # It's not clear if there's a good answer to this. |