diff options
| author | Will Holland <william.holland@codethink.co.uk> | 2015-09-28 07:15:40 +0100 |
|---|---|---|
| committer | Will Holland <william.holland@codethink.co.uk> | 2015-09-28 07:15:40 +0100 |
| commit | ca09c10cc8ca1cb722457158102e8f1d983809fc (patch) | |
| tree | c96137ed0e2267cb19aafacd7438c8548e989c59 | |
| parent | 16b3c3863d67095d45bc0a72293ec23ec2a2b45d (diff) | |
| download | buildslave-scripts-ca09c10cc8ca1cb722457158102e8f1d983809fc.tar.gz | |
Fix copying ybd.conf
| -rw-r--r-- | triggers/builders_trigger.sh | 4 | ||||
| -rw-r--r-- | triggers/deploy_trigger.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/triggers/builders_trigger.sh b/triggers/builders_trigger.sh index 126ef9e..c8690f7 100644 --- a/triggers/builders_trigger.sh +++ b/triggers/builders_trigger.sh @@ -14,6 +14,6 @@ git clone -n https://github.com/devcurmudgeon/ybd.git git --git-dir=./ybd/.git --work-tree=./ybd checkout 15.39 cp ../builder_logic.py . cp ../build_a_system.sh . -cp ybd.conf ybd -cp ybd.conf ybd/config +cp ../ybd.conf ybd +cp ../ybd.conf ybd/config ./bin/python builder_logic.py "$REF" "$SHA" "$SYSTEM" diff --git a/triggers/deploy_trigger.sh b/triggers/deploy_trigger.sh index dab3364..e4975a7 100644 --- a/triggers/deploy_trigger.sh +++ b/triggers/deploy_trigger.sh @@ -21,8 +21,8 @@ git clone -n https://github.com/devcurmudgeon/ybd.git git --git-dir=./ybd/.git --work-tree=./ybd checkout 15.39 cp ../deploy_logic.py . cp ../deploy_a_system.sh . -cp ybd.conf ybd -cp ybd.conf ybd/config +cp ../ybd.conf ybd +cp ../ybd.conf ybd/config if [ -d ybd ]; then rm -rf ybd fi |