Deploying vm183-m4 to vm186-m3

masters/master.client.nacl.llvm/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 
 # Copyright (c) 2011 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
@@ skipping 49 matching lines @@
 
     builds = []
     build = self.getHeadBuild(builder)
     number = 0
     while build and number < numBuilds:
         debugInfo["builds_scanned"] += 1
         number += 1
 
         # CHANGED WAS HERE:
         # Dropped got_revision as a source for got_rev.
+        got_rev = -1
 
         # Get the last revision in this build.
-        got_rev = -1
+        try:
+            if got_rev == -1:
+               got_rev = build.getProperty("trigger_by_revision")
+            if not self.comparator.isValidRevision(got_rev):
+                got_rev = -1
+        except:
+            pass
         try:
             if got_rev == -1:
                got_rev = build.getProperty("revision")
             if not self.comparator.isValidRevision(got_rev):
                 got_rev = -1
         except:
             pass
 
         # We ignore all builds that don't have last revisions.
         # TODO(nsylvain): If the build is over, maybe it was a problem
@@ skipping 137 matching lines @@
 
 ####### CHANGESOURCES
 
 # the 'change_source' list tells the buildmaster how it should find out about
 # source code changes. Any class which implements IChangeSource can be added
 # to this list: there are several in buildbot/changes/*.py to choose from.
 def NativeClientTreeFileSplitter(path):
   return ('llvm', path)
 
 
-llvm_poller = svnpoller.SVNPoller(
-    svnurl='http://llvm.org/svn/llvm-project/llvm/trunk',
-    split_file=NativeClientTreeFileSplitter,
-    revlinktmpl=(
-        'http://llvm.org/viewvc/llvm-project?view=rev&revision=%s'),
-    pollinterval=10)
+c['change_source'] = []
 
-llvm_gcc_poller = svnpoller.SVNPoller(
-    svnurl='http://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk',
-    split_file=NativeClientTreeFileSplitter,
-    revlinktmpl=(
-        'http://llvm.org/viewvc/llvm-project?view=rev&revision=%s'),
-    pollinterval=10)
-
-c['change_source'] = [llvm_poller, llvm_gcc_poller]
+for repo in [
+  'llvm',
+  'cfe',
+  'dragonegg',
+  'llvm-gcc-4.2',
+]:
+  poller = svnpoller.SVNPoller(
+      svnurl='http://llvm.org/svn/llvm-project/%s/trunk' % repo,
+      split_file=NativeClientTreeFileSplitter,
+      revlinktmpl='http://llvm.org/viewvc/llvm-project?view=rev&revision=%s',
+      pollinterval=10)
+  c['change_source'].append(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 13 matching lines @@
 # Some shortcut to simplify the code below.
 F_LINUX = m_linux.NativeClientFactory
 
 
 # The identifier of the factory is the build configuration. If two factories
 # are using the same build configuration, they should have the same identifier.
 
 factories = []
 
 # Linux
-factories.append(['llvm', '1llvm', F_LINUX(
-    tests=['nacl_trigger_llvm'])])
-factories.append(['llvm-scons', '1llvm', F_LINUX()])
-factories.append(['llvm-spec2k-x86', '1llvm', F_LINUX()])
-factories.append(['llvm-spec2k-arm', '1llvm', F_LINUX()])
+factories.append(['llvm', '1llvm', F_LINUX()])
 
 
 ####### SCHEDULERS
 ## configure the Schedulers
 # Main scheduler for all changes in trunk.
 primary_builders = []
 for f in factories:
   primary_builders.append(f[0])
 s_nacl = Scheduler(
    name='nacl',
    branch='llvm',
    treeStableTimer=0,
    builderNames=['llvm'],
 )
 
-s_llvm_trigger = Triggerable(
-    name='llvm_trigger',
-    builderNames=[
-        'llvm-scons',
-        'llvm-spec2k-x86',
-        'llvm-spec2k-arm',
-    ])
-
 c['schedulers'] = [
     s_nacl,
-    s_llvm_trigger,
 ]
 
 
-# Build each change separately.
-def mergeRequests(builder, req1, req2):
-  return False
-c['mergeRequests'] = mergeRequests
-
 
 # Setup a per slave lock to prevent more than one thing running at once on
 # a single slave.
 slave_lock = locks.SlaveLock('overload_lock', maxCount=1)
 
 
 
 # ----------------------------------------------------------------------------
 # BUILDER DEFINITIONS
 
@@ skipping 91 matching lines @@
 c['projectName'] = ActiveMaster.project_name
 c['projectURL'] = config.Master.project_url
 
 # the 'buildbotURL' string should point to the location where the buildbot's
 # internal web server (usually the html.Waterfall page) is visible. This
 # typically uses the port number set in the Waterfall 'status' entry, but
 # with an externally-visible host name which the buildbot cannot figure out
 # without some help.
 
 c['buildbotURL'] = 'http://build.chromium.org/p/client.nacl.llvm/'