summaryrefslogtreecommitdiff
path: root/builder_logic.py
diff options
context:
space:
mode:
authorWill Holland <william.holland@codethink.co.uk>2015-09-10 16:55:09 +0100
committerWill Holland <william.holland@codethink.co.uk>2015-09-10 16:55:09 +0100
commit7aa22de16092fc8da48f9541cb82b6fbbdf568ac (patch)
tree8b6dcd7f822906936adb88f61077ab722955ca4b /builder_logic.py
parentd11939b3d09ba2b8f503ed986f4d6c5d8de021a2 (diff)
downloadbuildslave-scripts-7aa22de16092fc8da48f9541cb82b6fbbdf568ac.tar.gz
add logging on exit
Diffstat (limited to 'builder_logic.py')
-rw-r--r--builder_logic.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/builder_logic.py b/builder_logic.py
index 37d1817..0fac350 100644
--- a/builder_logic.py
+++ b/builder_logic.py
@@ -26,6 +26,10 @@ def log(msg):
dt = str(datetime.datetime.now()).split('.')[0]
log_file.write("[%s] Builder Trigger: %s\n" % (dt, msg))
+def _exit(exit_val):
+ if exit_val: log('exiting unhappily')
+ exit(exit_val)
+
def files_changed():
''' return a list of files changed in latest commit to definitions'''
import os
@@ -58,7 +62,7 @@ def deploy(cluster):
log('deploying %s' % cluster)
exit_val = subprocess.call(['sh','%s' % DEPLOY_SCRIPT, '%s' % cluster])
log('deployment complete')
- exit(exit_val)
+ _exit(exit_val)
def trigger_testing(build_id):
import requests
@@ -73,8 +77,8 @@ if __name__ == '__main__':
for f in _files_changed:
if f in whitelist:
build_exit_val = build('systems/base-system-x86_64-generic.morph')
- if build_exit_val: exit(build_exit_val)
+ if build_exit_val: _exit(build_exit_val)
deploy_exit_val = deploy('clusters/tlsa.morph')
- if deploy_exit_val: exit(deploy_exit_val)
- exit(trigger_testing())
+ if deploy_exit_val: _exit(deploy_exit_val)
+ _exit(trigger_testing())
log('nothing whitelisted changed. No build started.')