Switch to new release poller for nacl sdk waterfall.

masters/master.client.nacl.sdk/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 
 # Copyright (c) 2012 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.
 
 # This is the buildmaster config file for the 'nacl' bot. It must
 # be installed as 'master.cfg' in your buildmaster's base directory
 # (although the filename can be changed with the --basedir option to
 # 'mktap buildbot master').
 
 # It has one job: define a dictionary named BuildmasterConfig. This
 # dictionary has a variety of keys to control different aspects of the
 # buildmaster. They are documented in docs/config.xhtml .
 
 import posixpath
 
 from buildbot.scheduler import Scheduler
 
 from common import chromium_utils
 
 from master import build_utils
-from master import svn_poller_with_comparator
+from master import buildspec_utils
 from master import gitiles_poller
 from master import master_utils
 from master import slaves_list
 from master.factory import annotator_factory
 
 import config
 import master_site_config
 
 ActiveMaster = master_site_config.NativeClientSDK
 
+if config.Master.git_internal_server_url is None:
+  config.Master.git_internal_server_url = (
+      'https://chrome-internal.googlesource.com')
+
 # This is the dictionary that the buildmaster pays attention to. We also use
 # a shorter alias to save typing.
 c = BuildmasterConfig = {}
 
 config.DatabaseSetup(c)
 
 ####### CHANGESOURCES
 
 def ChromiumNativeClientChangeFilter(commit_json, branch):
   if 'tree_diff' not in commit_json:
     return False
   for diff_entry in commit_json['tree_diff']:
     path = diff_entry['new_path']
     if (path == 'DEPS' or
         path.startswith('native_client_sdk/') or
         path.startswith('ppapi/')):
       return True
   return False
 
 
-def NativeClientSDKReleaseTreeFileSplitter(path):
-  """Filter chromium commits to those relevant to the sdk release.
-
-  Arguments:
-    path: a path which svn reports has changed.
-  Returns:
-    A tuple containing (branchname, subpath).
-  """
-  return ('multirel', path)
-
-
 multi_poller = gitiles_poller.GitilesPoller(
     repo_url=config.Master.git_server_url + '/chromium/src',
     svn_branch='multi',
     change_filter=ChromiumNativeClientChangeFilter)
 
-multirel_poller = svn_poller_with_comparator.SvnPollerWithComparator(
-    multi_poller.comparator,
-    svnurl=('%s/tools/buildspec/build/chrome-official' %
-        config.Master.trunk_internal_url),
-    svnbin=chromium_utils.SVN_BIN,
-    split_file=NativeClientSDKReleaseTreeFileSplitter,
-    revlinktmpl=(
-        'http://chromesshgw.corp.google.com/viewvc/chrome-internal?view=rev&revision=%s'),
-    pollinterval=10)
+release_poller = buildspec_utils.BuildspecPoller(
+    ['build/chrome-official'], svn_mode=False)
 
 c['change_source'] = [
     multi_poller,
-    multirel_poller,
+    release_poller,
 ]
 
 
 ####### BUILDERS
 
 # buildbot/process/factory.py provides several BuildFactory classes you can
 # start with, which implement build processes for common targets (GNU
 # autoconf projects, CPAN perl modules, etc). The factory.BuildFactory is the
 # base class, and is configured with a series of BuildSteps. When the build
 # is run, the appropriate buildslave is told to execute each Step in turn.
@@ skipping 115 matching lines @@
 # Must come before AutoSetupMaster().
 c['buildbotURL'] = ActiveMaster.buildbot_url
 
 # Adds common status and tools to this master.
 master_utils.AutoSetupMaster(c, ActiveMaster,
                              order_console_by_time=True,
                              tagComparator=multi_poller.comparator,
                              public_html='../master.chromium/public_html',
                              templates=['./templates',
                                         '../master.client.nacl/templates'])