provide bundled build slaves as plugins

Conflicts: master/buildbot/interfaces.py
buildbot · Jan 13, 2015 · 399672a · 399672a
1 parent ac32e34
commit 399672a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/master/buildbot/interfaces.py b/master/buildbot/interfaces.py
@@ -1147,7 +1147,7 @@ def logChunk(build, step, log, channel, text):
         pass
 
 
-class IBuildSlave(Interface):
+class IBuildSlave(IPlugin):
     # this is a marker interface for the BuildSlave class
     pass
 

diff --git a/master/buildbot/plugins/__init__.py b/master/buildbot/plugins/__init__.py
@@ -18,8 +18,12 @@
 """
 
 from buildbot.plugins.db import get_plugins
+from buildbot.interfaces import IBuildSlave
 from buildbot.interfaces import IChangeSource
 from buildbot.interfaces import IScheduler
 
+# Names here match the names of the corresponding Buildbot module, hence
+# 'changes', 'schedulers', but 'buildslave'
 changes = get_plugins('change_source', IChangeSource)
 schedulers = get_plugins('scheduler', IScheduler)
+buildslave = get_plugins('build_slave', IBuildSlave)
diff --git a/master/setup.py b/master/setup.py
@@ -226,6 +226,12 @@ def define_plugin_entries(groups):
                 'Periodic', 'Nightly', 'NightlyTriggerable']),
             ('buildbot.schedulers.trysched', [
                 'Try_Jobdir', 'Try_Userpass'])
+        ]),
+        ('buildbot.build_slave', [
+            ('buildbot.buildslave.base', ['BuildSlave']),
+            ('buildbot.buildslave.ec2', ['EC2LatentBuildSlave']),
+            ('buildbot.buildslave.libvirt', ['LibVirtSlave']),
+            ('buildbot.buildslave.openstack', ['OpenStackLatentBuildSlave'])
         ])
     ])
 }