diff options
| -rw-r--r-- | builder_logic.py | 17 | ||||
| -rw-r--r-- | triggers/builders_trigger.sh | 4 |
2 files changed, 15 insertions, 6 deletions
diff --git a/builder_logic.py b/builder_logic.py index 4bde451..feca395 100644 --- a/builder_logic.py +++ b/builder_logic.py @@ -71,13 +71,22 @@ def trigger_deploy(system): r = requests.post(url,data=payload) return not r.ok +def do_build_deploy(system): + build_exit_val = build(system) + if build_exit_val: _exit(build_exit_val) + return trigger_deploy(system) + if __name__ == '__main__': + import sys + try: + force = sys.argv[1] + except: + pass + if force=="force": + _exit(do_build_deploy(SYSTEM)) _files_changed = files_changed() systems_list = [] for f in _files_changed: if f in whitelist: - build_exit_val = build(SYSTEM) - if build_exit_val: _exit(build_exit_val) - log('about to trigger deploy ...') - _exit(trigger_deploy(SYSTEM)) + _exit(do_build_deploy(SYSTEM)) log('nothing whitelisted changed. No build started.') diff --git a/triggers/builders_trigger.sh b/triggers/builders_trigger.sh index a9019ed..dc568af 100644 --- a/triggers/builders_trigger.sh +++ b/triggers/builders_trigger.sh @@ -1,3 +1,3 @@ set -ex -echo "[$(date "+%F %R")] Builder triggered." >> ../../../../trigger_log -python builder_logic.py +echo "[$(date "+%F %R")] Builder triggered. $1" >> ../../../../trigger_log +python builder_logic.py $1 |