summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Holland <william.holland@codethink.co.uk>2015-09-16 15:00:30 +0100
committerWill Holland <william.holland@codethink.co.uk>2015-09-16 15:00:30 +0100
commit880fb6f31308485d26a17e7ddb66e1fb74312a91 (patch)
tree87774bed74a1837fe92cc95275b9c055d96eefed
parent58105ebc4599c32c3e2b3151f885a544af1ef774 (diff)
downloadbuildslave-scripts-880fb6f31308485d26a17e7ddb66e1fb74312a91.tar.gz
Fix checkout after writing config
-rw-r--r--triggers/builders_trigger.sh4
-rw-r--r--triggers/deploy_trigger.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/triggers/builders_trigger.sh b/triggers/builders_trigger.sh
index 67fb5e0..235cdb4 100644
--- a/triggers/builders_trigger.sh
+++ b/triggers/builders_trigger.sh
@@ -5,9 +5,9 @@ if [ -d ybd ]; then
rm -rf ybd
fi
git clone https://github.com/devcurmudgeon/ybd.git
-cp ybd.conf ybd
-cp ybd.conf ybd/config
cd ybd
git checkout 15.38
cd ..
+cp ybd.conf ybd
+cp ybd.conf ybd/config
python builder_logic.py $1
diff --git a/triggers/deploy_trigger.sh b/triggers/deploy_trigger.sh
index a5950dc..3aeb939 100644
--- a/triggers/deploy_trigger.sh
+++ b/triggers/deploy_trigger.sh
@@ -15,9 +15,9 @@ if [ -d ybd ]; then
rm -rf ybd
fi
git clone https://github.com/devcurmudgeon/ybd.git
-cp ybd.conf ybd
-cp ybd.conf ybd/config
cd ybd
git checkout 15.38
cd ..
+cp ybd.conf ybd
+cp ybd.conf ybd/config
python deploy_logic.py $SYSTEM $ARTEFACT $TESING_SHA