summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/bottlerock.py6
-rw-r--r--source/master.cfg2
2 files changed, 7 insertions, 1 deletions
diff --git a/source/bottlerock.py b/source/bottlerock.py
index 2a92c56..fd49f57 100644
--- a/source/bottlerock.py
+++ b/source/bottlerock.py
@@ -87,6 +87,12 @@ def deploy_complete():
status=400,
body="400: An artefact name is required")
return call_trigger('deploy_complete',artefact)
+ 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('deploy_complete',artefact,testing_sha)
if __name__ == '__main__':
run(host='0.0.0.0', port=8080, debug=True)
diff --git a/source/master.cfg b/source/master.cfg
index 99f2180..6dcdc35 100644
--- a/source/master.cfg
+++ b/source/master.cfg
@@ -124,7 +124,7 @@ 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_sha = util.Property('testing_sha',default="no testing sha given")
+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))