diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-09-30 09:12:36 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-30 09:12:36 +0100 |
| commit | 09e57c2a0ee09fe2be3abe8dbd906ca5adfc9a36 (patch) | |
| tree | 9fa7f3b75355668b40e521faaedf0b85e9af32ed | |
| parent | 268f22c6b59cc9969bdd8e40eb1c2ee172475fdb (diff) | |
| download | orchestration-09e57c2a0ee09fe2be3abe8dbd906ca5adfc9a36.tar.gz | |
Pass more properties down pipeline to publish
| -rw-r--r-- | source/bottlerock.py | 19 | ||||
| -rw-r--r-- | source/orch_config.py | 10 |
2 files changed, 24 insertions, 5 deletions
diff --git a/source/bottlerock.py b/source/bottlerock.py index aadb4ce..2f1fe1f 100644 --- a/source/bottlerock.py +++ b/source/bottlerock.py @@ -120,7 +120,24 @@ def deploy_complete(): try: properties = get_form( 'artefact', - 'testing_sha') + 'testing_sha', + 'buildslave_scripts_sha', + 'definitions_sha') + except Status400 as p: + return missing_property_response(p) + return sendchange('deploy_complete',properties) + +if __name__ == '__main__': + run(host='0.0.0.0', port=8080, debug=True) + +@post('/testing_complete') +def testing_complete(): + try: + properties = get_form( + 'artefact', + 'testing_sha', + 'buildslave_scripts_sha', + 'definitions_sha') except Status400 as p: return missing_property_response(p) return sendchange('deploy_complete',properties) diff --git a/source/orch_config.py b/source/orch_config.py index d54c83b..6cd4265 100644 --- a/source/orch_config.py +++ b/source/orch_config.py @@ -88,16 +88,18 @@ columns = [ slavenames=["local-slave"], properties = [ ('artefact','no artefact given'), - ('testing_sha','no testing SHA given')]), + ('testing_sha','no testing SHA given'), + ('buildslave_scripts_sha','no buildslave-scripts SHA given'), + ('definitions_sha','no definitions SHA given')]), Column( name = "6. Publishing", category = "publish", trigger = 'publish_trigger.sh', slavenames=["local-slave"], properties = [ - ('buildnumber',0), + ('artefact','no artefact given'), + ('testing_sha','no testing SHA given'), ('buildslave_scripts_sha','no buildslave-scripts SHA given'), - ('definitions_sha','no definitions SHA given'), - ('testing_sha','no testing SHA given')])] + ('definitions_sha','no definitions SHA given')])] web_user = "codething" web_user_password = "password" |