diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2015-09-24 16:27:46 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2015-09-24 16:35:46 +0000 |
commit | 1f711f1005da406eb00d7068421cfa45e8fcd5a0 (patch) | |
tree | f9ed7de889940fb1642c51d512b23576b59f88fb /firehose_call.py | |
parent | 37ab039dcefcb3c22a2d117ef26475d386b83223 (diff) | |
download | buildslave-scripts-1f711f1005da406eb00d7068421cfa45e8fcd5a0.tar.gz |
Attempt 2 of "Allow firehose config split into directories"
Diffstat (limited to 'firehose_call.py')
-rw-r--r-- | firehose_call.py | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/firehose_call.py b/firehose_call.py index 8e7b75c..bdf23de 100644 --- a/firehose_call.py +++ b/firehose_call.py @@ -4,7 +4,7 @@ import os FIREHOSE_DIR = 'src/firehose' LOGFILE = os.path.expanduser("~/orchestration/trigger_log") -from firehose_mappings import mapping +from firehose_config import get_landings log_file = open(LOGFILE,'a') @@ -35,17 +35,13 @@ if __name__ == '__main__': print "firehose_map.py requires a repo argument" exit(1) - try: - configs = mapping[repo] - except: - log("Unknown repo: %s, Firehose not triggered" % repo) - exit(0) - - os.chdir(FIREHOSE_DIR) - exit_val = subprocess.call(firehose_cmd(configs)) - if not exit_val: - log("Successful") - exit(exit_val) - else: - log("Unsuccessful") - exit(exit_val) + landings = get_landings(FIREHOSE_DIR) + + for configs in landings: + if not configs: continue + exit_val = subprocess.call(firehose_cmd(configs), cwd=FIREHOSE_DIR) + if not exit_val: + log("Successfully configured %s" % ', '.join(configs)) + else: + log("Unsuccessful") + exit(exit_val) |