Make Trigger step recognize NightlyTriggerable.

master/buildbot/interfaces.py

@@ -1207,3 +1207,12 @@ def render(value):
         @name value: value to render
         @returns: rendered value
         """
+
+class ITriggerableScheduler(Interface):
+    """
+    A scheduler that can be triggered by buildsteps.
+    """
+
+    def trigger(ssid, set_props=None):
+        """Trigger a build with the given source stamp and properties.
+        """

master/buildbot/schedulers/timed.py

@@ -14,7 +14,10 @@
 # Copyright Buildbot Team Members
 
 import time
+from zope.interface import implements
+
 from buildbot import util
+from buildbot.interfaces import ITriggerableScheduler
 from buildbot.process import buildstep, properties
 from buildbot.schedulers import base
 from twisted.internet import defer, reactor
@@ -377,6 +380,7 @@ def startBuild(self):
             wfd.getResult()
 
 class NightlyTriggerable(NightlyBase):
+    implements(ITriggerableScheduler)
     def __init__(self, name, builderNames, minute=0, hour='*',
                  dayOfMonth='*', month='*', dayOfWeek='*',
                  properties={}):

master/buildbot/schedulers/triggerable.py

@@ -13,12 +13,16 @@
 #
 # Copyright Buildbot Team Members
 
+from zope.interface import implements
+
 from twisted.python import failure
 from twisted.internet import defer
+from buildbot.interfaces import ITriggerableScheduler
 from buildbot.schedulers import base
 from buildbot.process.properties import Properties
 
 class Triggerable(base.BaseScheduler):
+    implements(ITriggerableScheduler)
 
     compare_attrs = base.BaseScheduler.compare_attrs
 

master/buildbot/steps/trigger.py

@@ -13,9 +13,9 @@
 #
 # Copyright Buildbot Team Members
 
+from buildbot.interfaces import ITriggerableScheduler
 from buildbot.process.buildstep import LoggingBuildStep, SUCCESS, FAILURE, EXCEPTION
 from buildbot.process.properties import Properties
-from buildbot.schedulers.triggerable import Triggerable
 from twisted.python import log
 from twisted.internet import defer
 
@@ -94,7 +94,7 @@ def start(self):
             scheduler = scheduler
             if all_schedulers.has_key(scheduler):
                 sch = all_schedulers[scheduler]
-                if isinstance(sch, Triggerable):
+                if ITriggerableScheduler.providedBy(sch):
                     triggered_schedulers.append(scheduler)
                 else:
                     unknown_schedulers.append(scheduler)