diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-09-08 16:08:29 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-08 16:08:29 +0100 |
| commit | 9929462cb62e02c4eea2f298cfa4dc051cba71de (patch) | |
| tree | 956e588a23f6204ac1f5c3e4985fb73cba1ef432 | |
| parent | 037085c49235c7f89c3a0b2a55091fbb5c5b556c (diff) | |
| download | orchestration-9929462cb62e02c4eea2f298cfa4dc051cba71de.tar.gz | |
Pass repo_name from bottle to firehose_trigger
| -rw-r--r-- | source/firehose_trigger.sh | 2 | ||||
| -rw-r--r-- | source/master.cfg | 11 | ||||
| -rw-r--r-- | source/repo_update.sh | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/source/firehose_trigger.sh b/source/firehose_trigger.sh index e4245ab..acb1761 100644 --- a/source/firehose_trigger.sh +++ b/source/firehose_trigger.sh @@ -1 +1 @@ -echo "[$(date "+%F %R")] Firehose triggered." >> ../../../../trigger_log +echo "[$(date "+%F %R")] Firehose triggered with repo: $1" >> ../../../../trigger_log diff --git a/source/master.cfg b/source/master.cfg index 9770840..f46a006 100644 --- a/source/master.cfg +++ b/source/master.cfg @@ -76,17 +76,20 @@ 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() -# run the tests (note that this will require that 'trial' is installed) builders_factory.addStep(ShellCommand(command=["sh","../../../../source/builders_trigger.sh"])) firehose_factory = BuildFactory() -# run the tests (note that this will require that 'trial' is installed) -firehose_factory.addStep(ShellCommand(command=["sh","../../../../source/firehose_trigger.sh"])) +#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')])) +repo_name = util.Property('repo_name',default="no repo name given") +firehose_cmd = ["sh","../../../../source/firehose_trigger.sh",repo_name] +firehose_factory.addStep(ShellCommand(command=firehose_cmd)) testing_factory = BuildFactory() -# run the tests (note that this will require that 'trial' is installed) testing_factory.addStep(ShellCommand(command=["sh","../../../../source/testing_trigger.sh"])) from buildbot.config import BuilderConfig diff --git a/source/repo_update.sh b/source/repo_update.sh index 4cbe4d3..99fffab 100644 --- a/source/repo_update.sh +++ b/source/repo_update.sh @@ -9,4 +9,5 @@ port=9999 user=orchestration passwd=orchestration -buildbot sendchange -m "$IP":"$port" -a "$user":"$passwd" -W scriptbot -C "$category" +echo $1 +../orchenv-master/bin/buildbot sendchange -m "$IP":"$port" -a "$user":"$passwd" -W scriptbot -C "$category" -p "repo_name":"$1" |