summaryrefslogtreecommitdiff
path: root/source/master.cfg
diff options
context:
space:
mode:
authorWill Holland <william.holland@codethink.co.uk>2015-09-09 16:00:32 +0100
committerWill Holland <william.holland@codethink.co.uk>2015-09-09 16:00:32 +0100
commit49c77bbf97b2697340be96353078fd694f483b0b (patch)
tree9f2fb5f003492c228743bc6e58160c135a3a6a8c /source/master.cfg
parent0536c62e9655c2bac5bf6374a982867f09ac439c (diff)
downloadorchestration-49c77bbf97b2697340be96353078fd694f483b0b.tar.gz
Add buildslave repo
Diffstat (limited to 'source/master.cfg')
-rw-r--r--source/master.cfg18
1 files changed, 12 insertions, 6 deletions
diff --git a/source/master.cfg b/source/master.cfg
index f46a006..c1a084b 100644
--- a/source/master.cfg
+++ b/source/master.cfg
@@ -77,20 +77,26 @@ c['schedulers'].append(SingleBranchScheduler(
from buildbot.process.factory import BuildFactory
from buildbot.steps.shell import ShellCommand
from buildbot.plugins import steps, util
-from buildbot.plugins import util
builders_factory = BuildFactory()
-builders_factory.addStep(ShellCommand(command=["sh","../../../../source/builders_trigger.sh"]))
+builders_factory.addStep(steps.Git(
+ repourl='git://cu010-trove.codethink.com/cu010-trove/br6/buildslave-scripts.git',
+ mode='incremental'))
+builders_factory.addStep(ShellCommand(command=["sh","triggers/builders_trigger.sh"]))
firehose_factory = BuildFactory()
-#firehose_factory.addStep(ShellCommand(command=["sh","../../../../source/firehose_trigger.sh"]))
-#firehose_factory.addStep(steps.ShellCommand(command=["sh","../../../../source/firehose_trigger.sh",util.Property('repo_name')]))
+firehose_factory.addStep(steps.Git(
+ repourl='git://cu010-trove.codethink.com/cu010-trove/br6/buildslave-scripts.git',
+ mode='incremental'))
repo_name = util.Property('repo_name',default="no repo name given")
-firehose_cmd = ["sh","../../../../source/firehose_trigger.sh",repo_name]
+firehose_cmd = ["sh","triggers/firehose_trigger.sh",repo_name]
firehose_factory.addStep(ShellCommand(command=firehose_cmd))
testing_factory = BuildFactory()
-testing_factory.addStep(ShellCommand(command=["sh","../../../../source/testing_trigger.sh"]))
+testing_factory.addStep(steps.Git(
+ repourl='git://cu010-trove.codethink.com/cu010-trove/br6/buildslave-scripts.git',
+ mode='incremental'))
+testing_factory.addStep(ShellCommand(command=["sh","triggers/testing_trigger.sh"]))
from buildbot.config import BuilderConfig