diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-09-21 16:30:03 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-21 16:30:03 +0100 |
| commit | 261c8e8221cfa8f1723af2bde7b2386951722bdd (patch) | |
| tree | 0b085a14075145aeef54e64d3840dfea48128fa1 | |
| parent | 1b52b1b163c4cc43e21ec246bf7b1bcc4508fb81 (diff) | |
| download | buildslave-scripts-261c8e8221cfa8f1723af2bde7b2386951722bdd.tar.gz | |
Pass sha to builder logic
| -rw-r--r-- | builder_logic.py | 11 | ||||
| -rw-r--r-- | triggers/builders_trigger.sh | 3 |
2 files changed, 9 insertions, 5 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)) diff --git a/triggers/builders_trigger.sh b/triggers/builders_trigger.sh index a118c31..980036d 100644 --- a/triggers/builders_trigger.sh +++ b/triggers/builders_trigger.sh @@ -1,5 +1,6 @@ set -ex REF=$1 +SHA=$2 echo "[$(date "+%F %R")] Builder triggered. Ref=\"$1\"" >> ../../../../trigger_log if [ -d ybd ]; then @@ -11,4 +12,4 @@ git checkout 15.38 cd .. cp ybd.conf ybd cp ybd.conf ybd/config -python builder_logic.py $REF +python builder_logic.py $REF $SHA |