diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-09-15 14:42:16 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-15 14:42:16 +0100 |
| commit | 1d82dc92b00b59432d348bed9b46b80bfc612814 (patch) | |
| tree | b4343e1889ba8344f40cf8d5e3547786669baf59 | |
| parent | 096d93f8d3490989d1893173bcf092d5a2d58d5e (diff) | |
| download | buildslave-scripts-1d82dc92b00b59432d348bed9b46b80bfc612814.tar.gz | |
Pass whole name rather than just buildnumber
| -rw-r--r-- | deploy_logic.py | 8 | ||||
| -rw-r--r-- | tlsa.morph | 2 | ||||
| -rw-r--r-- | triggers/deploy_trigger.sh | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/deploy_logic.py b/deploy_logic.py index a3dc6ce..da69c7e 100644 --- a/deploy_logic.py +++ b/deploy_logic.py @@ -36,19 +36,19 @@ def deploy(cluster): log('deployment complete') return exit_val -def trigger_testing(buildnumber): +def trigger_testing(artefact): import requests global url url = '%sdeploy_complete' % ORCHE_URL log("triggering testing") - payload = {'buildnumber':buildnumber} + payload = {'artefact':artefact} r = requests.post(url,data=payload) return not r.ok if __name__ == '__main__': import sys system = sys.argv[1] - buildnumber = sys.argv[2] + artefact = sys.argv[2] deploy_exit_val = deploy('clusters/tlsa.morph') if deploy_exit_val: _exit(deploy_exit_val) - _exit(trigger_testing(buildnumber)) + _exit(trigger_testing(artefact)) @@ -7,7 +7,7 @@ systems: deploy: tlsa-ciat-test-x86_64: type: extensions/rawdisk - location: /archive/tlsa-ciat-test-x86_64_BUILDNUMBER.raw + location: /archive/ARTEFACT.raw DISK_SIZE: 6G ROOT_DEVICE: /dev/vda INSTALL_FILES: install-files/ciat/manifest diff --git a/triggers/deploy_trigger.sh b/triggers/deploy_trigger.sh index e4c3741..b4d5ebd 100644 --- a/triggers/deploy_trigger.sh +++ b/triggers/deploy_trigger.sh @@ -1,6 +1,7 @@ set -ex SYSTEM=$1 BUILDNUMBER=$2 +ARTEFACT="tlsa-ciat-test-x86_64_$BUILDNUMBER" echo "[$(date "+%F %R")] Deploy triggered with system $SYSTEM." >> ../../../../trigger_log -sed "s/BUILDNUMBER/$BUILDNUMBER/" tlsa.morph > definitions/clusters/tlsa.morph -python deploy_logic.py $SYSTEM $BUILDNUMBER +sed "s/ARTEFACT/$ARTEFACT/" tlsa.morph > definitions/clusters/tlsa.morph +python deploy_logic.py $SYSTEM $ARTEFACT |