diff options
| -rw-r--r-- | source/bottlerock.py | 17 | ||||
| -rw-r--r-- | source/build_complete.sh | 6 | ||||
| -rw-r--r-- | source/deploy_complete.sh | 2 | ||||
| -rw-r--r-- | source/master.cfg | 13 |
4 files changed, 33 insertions, 5 deletions
diff --git a/source/bottlerock.py b/source/bottlerock.py index 3909ee5..2a92c56 100644 --- a/source/bottlerock.py +++ b/source/bottlerock.py @@ -62,7 +62,22 @@ def build_complete(): return HTTPResponse( status=400, body="400: A system name is required") - return call_trigger('build_complete',system) + buildslave_scripts_sha = request.forms.get("buildslave_scripts_sha") + if not buildslave_scripts_sha: + return HTTPResponse( + status=400, + body="400: A buildslave_scripts_sha is required") + definitions_sha = request.forms.get("definitions_sha") + if not definitions_sha: + return HTTPResponse( + status=400, + body="400: A definitions_sha is required") + testing_sha = request.forms.get("testing_sha") + if not testing_sha: + return HTTPResponse( + status=400, + body="400: A testing_sha is required") + return call_trigger('build_complete',system,buildslave_scripts_sha,definitions_sha,testing_sha) @post('/deploy_complete') def deploy_complete(): diff --git a/source/build_complete.sh b/source/build_complete.sh index 058f86a..0944091 100644 --- a/source/build_complete.sh +++ b/source/build_complete.sh @@ -1,6 +1,10 @@ #!/bin/sh # this will run once ybd has finished a build set -e +SYSTEM=$1 +BUILDSLAVE_SCRIPTS_SHA=$2 +DEFINITIONS_SHA=$3 +TESTING_SHA=$4 category=postbuild @@ -9,4 +13,4 @@ port=9999 user=orchestration passwd=orchestration -../orchenv-master/bin/buildbot sendchange -m "$IP":"$port" -a "$user":"$passwd" -W scriptbot -C "$category" -p "system":"$1" +../orchenv-master/bin/buildbot sendchange -m "$IP":"$port" -a "$user":"$passwd" -W scriptbot -C "$category" -p "system":"$SYSTEM" -p "buildslave_scripts_sha":"$BUILDSLAVE_SCRIPTS_SHA" -p "definitions_sha":"$DEFINITIONS_SHA diff --git a/source/deploy_complete.sh b/source/deploy_complete.sh index d4bae84..a498bac 100644 --- a/source/deploy_complete.sh +++ b/source/deploy_complete.sh @@ -9,4 +9,4 @@ port=9999 user=orchestration passwd=orchestration -../orchenv-master/bin/buildbot --verbose sendchange -m "$IP":"$port" -a "$user":"$passwd" -W scriptbot -C "$category" -p "artefact":"$1" +../orchenv-master/bin/buildbot --verbose sendchange -m "$IP":"$port" -a "$user":"$passwd" -W scriptbot -C "$category" -p "artefact":"$1" -p "testing_sha":"$2" diff --git a/source/master.cfg b/source/master.cfg index ff2fa61..99f2180 100644 --- a/source/master.cfg +++ b/source/master.cfg @@ -107,8 +107,16 @@ deploy_factory.addStep(steps.Git( mode='incremental')) deploy_factory.addStep(ShellCommand(command=["sh","get_definitions.sh"])) system = util.Property('system',default="no system given") +buildslave_scripts_sha = util.Property('buildslave_scripts_sha',default="no buildslave-scripts sha given") +definitions_sha = util.Property('definitions_sha',default="no definitions sha given") +testing_sha = util.Property('testing_sha',default="no testing sha given") buildnumber = util.Property('buildnumber',default=0) -deploy_cmd = ["sh","triggers/deploy_trigger.sh",system,buildnumber] +deploy_cmd = ["sh","triggers/deploy_trigger.sh", + system, + buildnumber, + buildslave_scripts_sha, + definitions_sha, + testing_sha] deploy_factory.addStep(ShellCommand(command=deploy_cmd)) testing_factory = BuildFactory() @@ -116,7 +124,8 @@ testing_factory.addStep(steps.Git( repourl='git://cu010-trove.codethink.com/cu010-trove/br6/buildslave-scripts.git', mode='incremental')) artefact = util.Property('artefact',default=0) -testing_cmd = ["sh","triggers/testing_trigger.sh",artefact] +testing_sha = util.Property('testing_sha',default="no testing sha given") +testing_cmd = ["sh","triggers/testing_trigger.sh",artefact,testing_sha] testing_factory.addStep(ShellCommand(command=testing_cmd)) from buildbot.config import BuilderConfig |