diff options
author | Will Holland <william.holland@codethink.co.uk> | 2015-09-21 17:44:56 +0100 |
---|---|---|
committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-21 17:44:56 +0100 |
commit | 0c687f281dd1df694d1e0ffc1751822fc0067406 (patch) | |
tree | c850643d397656f30021bb14d046c20cb22cd9c3 /builder_logic.py | |
parent | 347261852a32751661c4272ee52df53fc9c76277 (diff) | |
download | buildslave-scripts-0c687f281dd1df694d1e0ffc1751822fc0067406.tar.gz |
Pass system as property through CIAT
Diffstat (limited to 'builder_logic.py')
-rw-r--r-- | builder_logic.py | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/builder_logic.py b/builder_logic.py index 51cb8b2..a66c2ad 100644 --- a/builder_logic.py +++ b/builder_logic.py @@ -1,7 +1,7 @@ import subprocess, os ORCHE_URL = 'http://127.0.0.1:8080/' -SYSTEM='genivi-demo-platform-x86_64-generic.morph' +DEFAULT_SYSTEM='genivi-demo-platform-x86_64-generic.morph' BUILD_SCRIPT = 'build_a_system.sh' DEPLOY_SCRIPT = 'deploy_a_system.sh' DEFINITIONS_DIR='definitions' @@ -25,6 +25,7 @@ log_file = open(LOGFILE,'a') def log(msg): ''' write message to log file with timestamp and script name ''' import datetime + global log_file dt = str(datetime.datetime.now()).split('.')[0] log_file.write("[%s] Builder Trigger: %s\n" % (dt, msg)) @@ -62,8 +63,12 @@ def build(system): log('build complete') return exit_val -def trigger_deploy(system, buildslave_scripts_sha, definitions_sha, testing_sha): +def trigger_deploy(system): import requests + global url + global buildslave_scripts_sha + global definitions_sha + global testing_sha url = '%sbuild_complete' % ORCHE_URL if not system: return 0 payload = { @@ -76,10 +81,10 @@ def trigger_deploy(system, buildslave_scripts_sha, definitions_sha, testing_sha) r = requests.post(url,data=payload) return not r.ok -def do_build_deploy(system, buildslave_scripts_sha, definitions_sha, testing_sha): +def do_build_deploy(system): build_exit_val = build(system) if build_exit_val: _exit(build_exit_val) - return trigger_deploy(system, buildslave_scripts_sha, definitions_sha, testing_sha) + return trigger_deploy(system) def get_buildslave_scripts_sha(): _cmd = ['git','ls-remote',BUILDSLAVE_SCRIPTS_REPO] @@ -105,6 +110,9 @@ def get_testing_sha(): if __name__ == '__main__': import sys + global buildslave_scripts_sha + global definitions_sha + global testing_sha try: ref = sys.argv[1] except: @@ -113,14 +121,18 @@ if __name__ == '__main__': definitions_sha = sys.argv[2] except: definitons_sha = get_definitions_sha(ref if ref != 'force' else 'HEAD') + try: + system = sys.argv[3] + except: + system = DEFAULT_SYSTEM buildslave_scripts_sha = get_buildslave_scripts_sha() testing_sha = get_testing_sha() if ref=="force": - _exit(do_build_deploy(SYSTEM, buildslave_scripts_sha, definitions_sha, testing_sha)) + _exit(do_build_deploy(system)) #_files_changed = files_changed(ref) systems_list = [] #for f in _files_changed: # if f in whitelist: - # _exit(do_build_deploy(SYSTEM, buildslave_scripts_sha, definitions_sha, testing_sha)) - _exit(do_build_deploy(SYSTEM, buildslave_scripts_sha, definitions_sha, testing_sha)) + # _exit(do_build_deploy(system)) + _exit(do_build_deploy(system)) log('nothing whitelisted changed. No build started.') |