diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-09-28 07:19:12 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-28 07:19:12 +0100 |
| commit | a592b6c4214da944a80e7670226a6030b844ee5e (patch) | |
| tree | 3f7b9b1a0ee9f21567ff146633595a99967f146b | |
| parent | ca09c10cc8ca1cb722457158102e8f1d983809fc (diff) | |
| download | buildslave-scripts-a592b6c4214da944a80e7670226a6030b844ee5e.tar.gz | |
Fix definitions being in the wrong place
| -rw-r--r-- | triggers/builders_trigger.sh | 1 | ||||
| -rw-r--r-- | triggers/deploy_trigger.sh | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/triggers/builders_trigger.sh b/triggers/builders_trigger.sh index c8690f7..e4577cc 100644 --- a/triggers/builders_trigger.sh +++ b/triggers/builders_trigger.sh @@ -16,4 +16,5 @@ cp ../builder_logic.py . cp ../build_a_system.sh . cp ../ybd.conf ybd cp ../ybd.conf ybd/config +mv ../definitions . ./bin/python builder_logic.py "$REF" "$SHA" "$SYSTEM" diff --git a/triggers/deploy_trigger.sh b/triggers/deploy_trigger.sh index e4975a7..e4725ef 100644 --- a/triggers/deploy_trigger.sh +++ b/triggers/deploy_trigger.sh @@ -8,8 +8,6 @@ ARTEFACT="tlsa-ciat-test-x86_64_$BUILDNUMBER" echo "[$(date "+%F %R")] Deploy triggered with system $SYSTEM." >> ../../../../trigger_log sed "s/ARTEFACT/$ARTEFACT/" tlsa.morph > definitions/clusters/tlsa.morph git checkout $BUILDSLAVE_SCRIPTS_SHA -cd definitions -git checkout $DEFINITIONS_SHA cd .. if [ -d ybd-env ]; then rm -rf ybd-env @@ -26,4 +24,8 @@ cp ../ybd.conf ybd/config if [ -d ybd ]; then rm -rf ybd fi +mv ../definitions . +cd definitions +git checkout $DEFINITIONS_SHA +cd .. ./bin/python deploy_logic.py $SYSTEM $ARTEFACT $TESING_SHA |