From a236bba067a5fdbde229a4ff8aaad5ec2414bee6 Mon Sep 17 00:00:00 2001 From: Will Holland Date: Fri, 18 Sep 2015 12:15:26 +0100 Subject: Take a ref from master --- builder_logic.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'builder_logic.py') diff --git a/builder_logic.py b/builder_logic.py index 11413fb..3578a7e 100644 --- a/builder_logic.py +++ b/builder_logic.py @@ -5,7 +5,7 @@ SYSTEM='genivi-demo-platform-x86_64-generic.morph' BUILD_SCRIPT = 'build_a_system.sh' DEPLOY_SCRIPT = 'deploy_a_system.sh' DEFINITIONS_DIR='definitions' -REF = "cu010-trove/br6/firehose-test-1" +DEFAULT_REF = "cu010-trove/br6/firehose-test-1" TESTING_REPO = 'ssh://git@cu010-trove.codethink.com/cu010-trove/br6/ciat-tester' BUILDSLAVE_SCRIPTS_REPO = 'ssh://git@cu010-trove.codethink.com/cu010-trove/br6/buildslave-scripts' @@ -33,12 +33,12 @@ def _exit(exit_val): if exit_val: log('exiting unhappily') exit(exit_val) -def files_changed(): +def files_changed(ref): ''' return a list of files changed in latest commit to definitions''' import os owd = os.getcwd() os.chdir(DEFINITIONS_DIR) - SHAcmd = ['git', 'log', REF, '--format=format:%H', '-2'] + SHAcmd = ['git', 'log', ref, '--format=format:%H', '-2'] SHAproc = subprocess.Popen(SHAcmd, stdout=subprocess.PIPE) SHAout, SHAerr = SHAproc.communicate() SHA = SHAout.split() @@ -92,11 +92,11 @@ def get_buildslave_scripts_sha(): _out, _err = _proc.communicate() return _out.split()[0] -def get_definitions_sha(): +def get_definitions_sha(ref): import os owd = os.getcwd() os.chdir(DEFINITIONS_DIR) - _cmd = ['git', 'log', REF, '--format=format:%H', '-1'] + _cmd = ['git', 'log', ref, '--format=format:%H', '-1'] _proc = subprocess.Popen(_cmd, stdout=subprocess.PIPE) _out, _err = _proc.communicate() os.chdir(owd) @@ -110,20 +110,19 @@ def get_testing_sha(): if __name__ == '__main__': import sys - force = "" + try: + ref = sys.argv[1] + except: + ref = DEFAULT_REF global buildslave_scripts_sha global definitions_sha global testing_sha buildslave_scripts_sha = get_buildslave_scripts_sha() - definitions_sha = get_definitions_sha() + definitions_sha = get_definitions_sha(ref) testing_sha = get_testing_sha() - try: - force = sys.argv[1] - except: - pass - if force=="force": + if ref=="force": _exit(do_build_deploy(SYSTEM)) - _files_changed = files_changed() + _files_changed = files_changed(ref) systems_list = [] #for f in _files_changed: # if f in whitelist: -- cgit v1.2.1