diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-09-16 18:08:21 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-16 18:09:12 +0100 |
| commit | bb3d41b350b30e84423f2d077fca79c52205535f (patch) | |
| tree | 9fedce2d99fdffc4ea35039f6a5ec8c5e6527889 | |
| parent | f76cde5b0b80311e523deda48a67d8346f82f70b (diff) | |
| download | buildslave-scripts-bb3d41b350b30e84423f2d077fca79c52205535f.tar.gz | |
Make firehose local to slave
| -rw-r--r-- | firehose_call.py | 2 | ||||
| -rw-r--r-- | triggers/firehose_trigger.sh | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/firehose_call.py b/firehose_call.py index f212736..9405fe5 100644 --- a/firehose_call.py +++ b/firehose_call.py @@ -3,7 +3,7 @@ #cd /home/williamholland/src/firehose #./firehose.sh examples/*.yaml --log=/dev/stdout --log-level=debug -FIREHOSE_DIR = '/home/williamholland/src/firehose' +FIREHOSE_DIR = 'firehose' LOGFILE = '/home/williamholland/orchestration/trigger_log' from firehose_mappings import mapping diff --git a/triggers/firehose_trigger.sh b/triggers/firehose_trigger.sh index fb39329..a92a3e9 100644 --- a/triggers/firehose_trigger.sh +++ b/triggers/firehose_trigger.sh @@ -1,3 +1,10 @@ set -ex echo "[$(date "+%F %R")] Firehose triggered with repo: $1" >> ../../../../trigger_log +if [ -d firehose ]; then + rm -rf firehose +fi +git clone ssh://git@cu010-trove.codethink.com/baserock/baserock/firehose.git +cd firehose +git checkout cu010-trove/br6/williamholland +cd .. python firehose_call.py "$1" |