Clean up global variables in builder_logic.py

1 files changed, 6 insertions, 13 deletions

diff --git a/builder_logic.py b/builder_logic.py
index abaed60..51cb8b2 100644
--- a/builder_logic.py
+++ b/builder_logic.py
@@ -25,7 +25,6 @@ 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))
 
@@ -63,11 +62,8 @@ def build(system):
     log('build complete')
     return exit_val
 
-def trigger_deploy(system):
+def trigger_deploy(system, buildslave_scripts_sha, definitions_sha, testing_sha):
     import requests
-    global buildslave_scripts_sha
-    global definitions_sha
-    global testing_sha
     url = '%sbuild_complete' % ORCHE_URL
     if not system: return 0
     payload = {
@@ -80,10 +76,10 @@ def trigger_deploy(system):
     r = requests.post(url,data=payload)
     return not r.ok
 
-def do_build_deploy(system):
+def do_build_deploy(system, buildslave_scripts_sha, definitions_sha, testing_sha):
     build_exit_val = build(system)
     if build_exit_val: _exit(build_exit_val)
-    return trigger_deploy(system)
+    return trigger_deploy(system, buildslave_scripts_sha, definitions_sha, testing_sha)
 
 def get_buildslave_scripts_sha():
     _cmd = ['git','ls-remote',BUILDSLAVE_SCRIPTS_REPO]
@@ -109,9 +105,6 @@ 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:
@@ -123,11 +116,11 @@ if __name__ == '__main__':
     buildslave_scripts_sha = get_buildslave_scripts_sha()
     testing_sha = get_testing_sha()
     if ref=="force":
-        _exit(do_build_deploy(SYSTEM))
+        _exit(do_build_deploy(SYSTEM, buildslave_scripts_sha, definitions_sha, testing_sha))
     #_files_changed = files_changed(ref)
     systems_list = []
     #for f in _files_changed:
     #    if f in whitelist:
-    #        _exit(do_build_deploy(SYSTEM))
-    _exit(do_build_deploy(SYSTEM))
+    #        _exit(do_build_deploy(SYSTEM, buildslave_scripts_sha, definitions_sha, testing_sha))
+    _exit(do_build_deploy(SYSTEM, buildslave_scripts_sha, definitions_sha, testing_sha))
     log('nothing whitelisted changed. No build started.')