Deploying vm183-m4 to vm186-m3

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

Index: masters/master.client.nacl.llvm/master.cfg
===================================================================
--- masters/master.client.nacl.llvm/master.cfg	(revision 104506)
+++ masters/master.client.nacl.llvm/master.cfg	(working copy)
@@ -67,11 +67,18 @@
 
         # 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
@@ -227,23 +234,22 @@
   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)
+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)
 
-c['change_source'] = [llvm_poller, llvm_gcc_poller]
 
-
 ####### BUILDERS
 
 # buildbot/process/factory.py provides several BuildFactory classes you can
@@ -275,11 +281,7 @@
 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
@@ -295,26 +297,12 @@
    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)