diff options
author | Will Holland <william.holland@codethink.co.uk> | 2015-10-01 09:12:29 +0100 |
---|---|---|
committer | Will Holland <william.holland@codethink.co.uk> | 2015-10-01 09:12:29 +0100 |
commit | d65c46583d1e1355eb81b0711c61ef33cabbbb3e (patch) | |
tree | 044ff6db56b2b260ea7a425fd2e54f0006bda397 | |
parent | 4cc728238882209e284dfe4923fffb96088bceb3 (diff) | |
download | buildslave-scripts-d65c46583d1e1355eb81b0711c61ef33cabbbb3e.tar.gz |
Pass buildslave scripts sha and definitions sha from deploy
-rw-r--r-- | deploy_logic.py | 13 | ||||
-rw-r--r-- | triggers/deploy_trigger.sh | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/deploy_logic.py b/deploy_logic.py index 60f0451..ffa02a7 100644 --- a/deploy_logic.py +++ b/deploy_logic.py @@ -45,6 +45,8 @@ def trigger_testing(artefact,pipeline): payload = { 'artefact':artefact, 'testing_sha':testing_sha, + 'buildslave_scripts_sha':buildslave_scripts_sha, + 'definitions_sha':definitions_sha, 'pipeline':pipeline} r = requests.post(url,data=payload) return not r.ok @@ -54,11 +56,12 @@ if __name__ == '__main__': system = sys.argv[1] artefact = sys.argv[2] global testing_sha - try: - testing_sha = sys.argv[3] - except: - testing_sha = 'HEAD' - pipeline = sys.argv[4] + global buildslave_scripts_sha + global definitions_sha + testing_sha = sys.argv[3] + buildslave_scripts_sha = sys.argv[4] + definitions_sha = sys.argv[5] + pipeline = sys.argv[6] deploy_exit_val = deploy('clusters/tlsa.morph') if deploy_exit_val: _exit(deploy_exit_val) _exit(trigger_testing(artefact,pipeline)) diff --git a/triggers/deploy_trigger.sh b/triggers/deploy_trigger.sh index 3d2dc98..1d354ab 100644 --- a/triggers/deploy_trigger.sh +++ b/triggers/deploy_trigger.sh @@ -25,4 +25,4 @@ mv ../definitions . cd definitions git checkout $DEFINITIONS_SHA cd .. -./bin/python deploy_logic.py $SYSTEM $ARTEFACT $TESTING_SHA "$PIPELINE" +./bin/python deploy_logic.py $SYSTEM $ARTEFACT $TESTING_SHA "$DEFINITIONS_SHA" "$TESTING_SHA" "$PIPELINE" |