[zorg] r305486 - make AnnotatedBuilder use LLVMBuildFactory and depends_on_projects

[Bob Haarman via llvm-commits]

Author: inglorion
Date: Thu Jun 15 12:45:58 2017
New Revision: 305486

URL: http://llvm.org/viewvc/llvm-project?rev=305486&view=rev
Log:
make AnnotatedBuilder use LLVMBuildFactory and depends_on_projects

Summary:
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.

Reviewers: gkistanova, rnk

Reviewed By: rnk

Subscribers: rnk, hans, llvm-commits

Differential Revision: https://reviews.llvm.org/D34065

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/AnnotatedBuilder.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=305486&r1=305485&r2=305486&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Jun 15 12:45:58 2017
@@ -826,7 +826,8 @@ def _get_lld_builders():
          '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",

Modified: zorg/trunk/zorg/buildbot/builders/AnnotatedBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/AnnotatedBuilder.py?rev=305486&r1=305485&r2=305486&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/AnnotatedBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/AnnotatedBuilder.py Thu Jun 15 12:45:58 2017
@@ -1,16 +1,17 @@
 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):
     """
@@ -19,7 +20,9 @@ def getAnnotatedBuildFactory(
     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'))