diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-09-15 14:45:38 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-15 14:45:38 +0100 |
| commit | f66a203b1a850fb343a5e0a60f23ec5380f1fe51 (patch) | |
| tree | cc600939826f116b0b2b6b2a55aebe802624f987 | |
| parent | be44412e202e0181e04d97e403f54f79591b169e (diff) | |
| download | orchestration-f66a203b1a850fb343a5e0a60f23ec5380f1fe51.tar.gz | |
Pass artefact name not just buildnumber
| -rw-r--r-- | source/bottlerock.py | 8 | ||||
| -rw-r--r-- | source/deploy_complete.sh | 2 | ||||
| -rw-r--r-- | source/master.cfg | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/bottlerock.py b/source/bottlerock.py index 6c5f983..6e35a88 100644 --- a/source/bottlerock.py +++ b/source/bottlerock.py @@ -62,12 +62,12 @@ def build_complete(): @post('/deploy_complete') def deploy_complete(): - buildnumber = request.forms.get("buildnumber") - if not buildnumber: + artefact = request.forms.get("artefact") + if not artefact: return HTTPResponse( status=400, - body="400: A buildnumber is required") - return call_trigger('deploy_complete',buildnumber) + body="400: An artefact name is required") + return call_trigger('deploy_complete',artefact) if __name__ == '__main__': run(host='0.0.0.0', port=8080, debug=True) diff --git a/source/deploy_complete.sh b/source/deploy_complete.sh index 0a89bfe..d4bae84 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 "deploy_buildnumber":"$1" +../orchenv-master/bin/buildbot --verbose sendchange -m "$IP":"$port" -a "$user":"$passwd" -W scriptbot -C "$category" -p "artefact":"$1" diff --git a/source/master.cfg b/source/master.cfg index 168667c..90e2e4f 100644 --- a/source/master.cfg +++ b/source/master.cfg @@ -113,8 +113,8 @@ testing_factory = BuildFactory() testing_factory.addStep(steps.Git( repourl='git://cu010-trove.codethink.com/cu010-trove/br6/buildslave-scripts.git', mode='incremental')) -system = util.Property('deploy_buildnumber',default=0) -testing_cmd = ["sh","triggers/testing_trigger.sh",deploy_buildnumber] +system = util.Property('artefact',default=0) +testing_cmd = ["sh","triggers/testing_trigger.sh",artefact] testing_factory.addStep(ShellCommand(command=testing_cmd)) from buildbot.config import BuilderConfig |