Teach builders.pyl about RepoPoller.

scripts/master/master_gen.py

 # Copyright 2014 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.
 
 import ast
 import os
 
 from buildbot.schedulers.basic import SingleBranchScheduler
 from buildbot.schedulers.timed import Nightly
 from buildbot.status.mail import MailNotifier
 from buildbot import util
 
 from config_bootstrap import Master
 
 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
 
 
 def PopulateBuildmasterConfig(BuildmasterConfig, builders_path,
                               active_master_cls):
   """Read builders_path and populate a build master config dict."""
   builders = chromium_utils.ReadBuildersFile(builders_path)
   _Populate(BuildmasterConfig, builders, active_master_cls)
 
@@ skipping 101 matching lines @@
     if scheduler_name:
       if scheduler_name not in builders['schedulers']:
         raise ValueError('unknown scheduler "%s"' % scheduler_name)
       scheduler_to_builders.setdefault(scheduler_name, []).append(builder_name)
 
   schedulers = []
   for scheduler_name, scheduler_values in builders['schedulers'].items():
     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',
           treeStableTimer=60,
           builderNames=builder_names))
 
     elif scheduler_type == 'cron':
       schedulers.append(Nightly(
           name=scheduler_name,
           branch='master',
           minute=scheduler_values['minute'],
           hour=scheduler_values['hour'],
           builderNames=builder_names))
 
     else:
       raise ValueError('unsupported scheduler type "%s"' % scheduler_type)
 
   return schedulers
 
 
 def _ComputeChangeSourceAndTagComparator(builders):
   change_source = []
   tag_comparator = None
 
   for url in sorted(set(v['git_repo_url'] for
                         v in builders['schedulers'].values()
                         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 for value in ...

[danalbert, 2015/10/12 22:58:24]

Agreed that it could be a better name. Perhaps `scheduler_config`. Not sure what
you're suggesting in the second sentence since that's already what I have
here...

+    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_poller' above

[danalbert, 2015/10/12 22:58:24]

Not sure what you mean by this either. Are you just asking for the if to be
merged in to the loop as a list comprehension? I had written it that way first,
but it seemed clunkier than this. Let me know if I misunderstood...

+
+    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 param to just "repo_url". The name
isn't great, but "manifest_url" is misleading because it should actually be
pointing to the parent of the manifest directory.

+        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` parameter into something configurable
as well? The treeStableTimer part of the scheduler was hard coded, so wasn't
sure if we were trying to make people use reasonable defaults to keep the load
down or if it just hadn't been made configurable yet.

+        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 configurable

[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.
   if change_source:
     tag_comparator = change_source[0].comparator
 
   return change_source, tag_comparator