diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-09-15 14:16:36 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-15 14:16:36 +0100 |
| commit | be44412e202e0181e04d97e403f54f79591b169e (patch) | |
| tree | daf875d68e72218be3c76c9a42e6065d9e322d3e /source | |
| parent | bf0f4b517f9355043d9d77bc726e4f60e460733a (diff) | |
| download | orchestration-be44412e202e0181e04d97e403f54f79591b169e.tar.gz | |
Pass the deploy buildnumber to testing
Diffstat (limited to 'source')
| -rw-r--r-- | source/bottlerock.py | 7 | ||||
| -rw-r--r-- | source/deploy_complete.sh | 2 | ||||
| -rw-r--r-- | source/master.cfg | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/source/bottlerock.py b/source/bottlerock.py index 858cf6c..6c5f983 100644 --- a/source/bottlerock.py +++ b/source/bottlerock.py @@ -62,7 +62,12 @@ def build_complete(): @post('/deploy_complete') def deploy_complete(): - return call_trigger('deploy_complete') + buildnumber = request.forms.get("buildnumber") + if not buildnumber: + return HTTPResponse( + status=400, + body="400: A buildnumber is required") + return call_trigger('deploy_complete',buildnumber) 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 036778b..0a89bfe 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" +../orchenv-master/bin/buildbot --verbose sendchange -m "$IP":"$port" -a "$user":"$passwd" -W scriptbot -C "$category" -p "deploy_buildnumber":"$1" diff --git a/source/master.cfg b/source/master.cfg index 3e6a8ec..168667c 100644 --- a/source/master.cfg +++ b/source/master.cfg @@ -113,7 +113,9 @@ testing_factory = BuildFactory() 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"])) +system = util.Property('deploy_buildnumber',default=0) +testing_cmd = ["sh","triggers/testing_trigger.sh",deploy_buildnumber] +testing_factory.addStep(ShellCommand(command=testing_cmd)) from buildbot.config import BuilderConfig |