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 scheduler_config in builders['schedulers'].values():
+    if scheduler_config['type'] != 'repo_poller':
+      continue
+
+    rev_link_template = scheduler_config.get('rev_link_template', None)

[ghost stip (do not use), 2015/10/12 23:53:11]

.get() already returns None, so you can just do rev_link_template =
scheduler_config.get('rev_link_template')

I'd raise a ValueError() in that case though, since you don't want to people to
launch a master and then get confused when it doesn't pick up builds

[danalbert, 2015/10/13 00:29:52]

Yeah, I just felt writing it was better to be explicit (it is one of Python's
philosophies, after all) and that it helps show why I'm using `.get(key)`
instead of just `[key]`.

As for raising an error, afaict from looking through the RepoPoller source (the
parameter is undocumented :\), this isn't used for finding builds, but just for
printing the URL point to the revision (possibly from gititles) in the build
page. It isn't a required parameter of RepoPoller, and it's entirely possible
(albeit unlikely) that someone has configured a repo that doesn't actually have
a web interface.

+    branch = scheduler_config.get('branch', None)

[ghost stip (do not use), 2015/10/12 23:53:11]

same here, you can just do scheduler_config.get('branch')

+    change_source.append(repo_poller.RepoPoller(
+        repo_url=scheduler_config['repo_url'],
+        manifest='manifest',
+        repo_branches=[branch],

[ghost stip (do not use), 2015/10/12 23:53:11]

what happens if repo_branches = [None] ? should we raise a ValueError if this
isn't set?

[danalbert, 2015/10/13 00:29:51]

It should actually be either `None` or `[]` rather than `[None]`. RepoPoller
handles the default case by using `['master']`. I need to fix this to actually
do that correctly though.

+        pollInterval=300,
+        revlinktmpl=rev_link_template))
+
   # 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