[PATCH] D34065: make AnnotatedBuilder use LLVMBuildFactory and depends_on_projects

[Bob Haarman via Phabricator via llvm-commits]

inglorion created this revision.

This makes AnnotatedBuilder derive from LLVMBuildFactory
instead of the standard buildbot factory. This means it will have
the same properties and methods as the other builders - in particular,
depends_on_projects, which is used for scheduling.


https://reviews.llvm.org/D34065

Files:
  buildbot/osuosl/master/config/builders.py
  zorg/buildbot/builders/AnnotatedBuilder.py


Index: zorg/buildbot/builders/AnnotatedBuilder.py
===================================================================
--- zorg/buildbot/builders/AnnotatedBuilder.py
+++ zorg/buildbot/builders/AnnotatedBuilder.py
@@ -1,25 +1,28 @@
 import os
 
 import buildbot
-import buildbot.process.factory
 from buildbot.process.properties import WithProperties
 from buildbot.steps.shell import SetProperty, ShellCommand
 from buildbot.steps.source import SVN
 from zorg.buildbot.commands.AnnotatedCommand import AnnotatedCommand
+from zorg.buildbot.process.factory import LLVMBuildFactory
 
 
 def getAnnotatedBuildFactory(
     script,
     clean=False,
+    depends_on_projects=None,
     env=None,
     timeout=1200):
     """
     Returns a new build factory that uses AnnotatedCommand, which
     allows the build to be run by version-controlled scripts that do
     not require a buildmaster restart to update.
     """
 
-    f = buildbot.process.factory.BuildFactory()
+    f = LLVMBuildFactory(
+        depends_on_projects=depends_on_projects,
+        llvm_srcdir='llvm.src')
 
     if clean:
       f.addStep(SetProperty(property='clean', command='echo 1'))
Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -826,7 +826,8 @@
          'slavenames' :["windows-lld-thinlto-1"],
          'builddir': "clang-with-thin-lto-windows",
          'factory': AnnotatedBuilder.getAnnotatedBuildFactory(
-             script="clang-with-thin-lto-windows.py"),
+             script="clang-with-thin-lto-windows.py",
+             depends_on_projects=['llvm', 'clang', 'lld']),
          'category'   : 'lld'},
 
         {'name' : "clang-lld-x86_64-2stage",


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D34065.102072.patch
Type: text/x-patch
Size: 1809 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170609/d36d0f28/attachment.bin>