Separate deploy trigger from builder trigger

1 files changed, 8 insertions, 12 deletions

diff --git a/builder_logic.py b/builder_logic.py
index 0fac350..5c22676 100644
--- a/builder_logic.py
+++ b/builder_logic.py
@@ -58,27 +58,23 @@ def build(system):
     log('building %s' % system)
     return subprocess.call(['sh','%s' % BUILD_SCRIPT, '%s' % system])
 
-def deploy(cluster):
-    log('deploying %s' % cluster)
-    exit_val = subprocess.call(['sh','%s' % DEPLOY_SCRIPT, '%s' % cluster])
-    log('deployment complete')
-    _exit(exit_val)
-
-def trigger_testing(build_id):
+def trigger_deploy(system):
     import requests
     global url
     url = '%sbuild_complete' % ORCHE_URL
-    payload = {'artefact':build_id}
+    if not systems_list: return 0
+    payload = {'system':system}
     r = requests.post(url,data=payload)
     return r.ok
 
 if __name__ == '__main__':
     _files_changed = files_changed()
+    systems_list = []
     for f in _files_changed:
         if f in whitelist:
-            build_exit_val = build('systems/base-system-x86_64-generic.morph')
+            # TODO fix this being hardcoded
+            system = 'systems/base-system-x86_64-generic.morph'
+            build_exit_val = build(system)
             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())
+            _exit(trigger_deploy(system))
     log('nothing whitelisted changed. No build started.')