summaryrefslogtreecommitdiff
path: root/builder_logic.py
diff options
context:
space:
mode:
authorWill Holland <william.holland@codethink.co.uk>2015-09-21 16:30:03 +0100
committerWill Holland <william.holland@codethink.co.uk>2015-09-21 16:30:03 +0100
commit261c8e8221cfa8f1723af2bde7b2386951722bdd (patch)
tree0b085a14075145aeef54e64d3840dfea48128fa1 /builder_logic.py
parent1b52b1b163c4cc43e21ec246bf7b1bcc4508fb81 (diff)
downloadbuildslave-scripts-261c8e8221cfa8f1723af2bde7b2386951722bdd.tar.gz
Pass sha to builder logic
Diffstat (limited to 'builder_logic.py')
-rw-r--r--builder_logic.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/builder_logic.py b/builder_logic.py
index b981ddb..642b286 100644
--- a/builder_logic.py
+++ b/builder_logic.py
@@ -110,15 +110,18 @@ 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:
ref = DEFAULT_REF
- global buildslave_scripts_sha
- global definitions_sha
- global testing_sha
+ try:
+ definitions_sha = sys.argv[2]
+ except:
+ definitons_sha = get_definitions_sha(ref if ref != 'force' else 'HEAD')
buildslave_scripts_sha = get_buildslave_scripts_sha()
- definitons_sha = get_definitions_sha(ref if ref != 'force' else 'HEAD')
testing_sha = get_testing_sha()
if ref=="force":
_exit(do_build_deploy(SYSTEM))