diff options
| -rwxr-xr-x | build_a_system.sh | 4 | ||||
| -rwxr-xr-x | deploy_a_system.sh | 4 | ||||
| -rw-r--r-- | triggers/builders_trigger.sh | 8 | ||||
| -rw-r--r-- | triggers/deploy_trigger.sh | 7 |
4 files changed, 19 insertions, 4 deletions
diff --git a/build_a_system.sh b/build_a_system.sh index 4c2819f..6be12d5 100755 --- a/build_a_system.sh +++ b/build_a_system.sh @@ -6,8 +6,8 @@ set -ex system_name="$1" -definitions_dir=definitions -ybd_dir=/home/patrickdarley/ybd +definitions_dir=$(pwd)/definitions +ybd_dir=$(pwd)/ybd # Building is optimal with 5 "instances" on the monster machine sudo sed -i '/^instances: /c\instances: 5' "$ybd_dir"/ybd.conf diff --git a/deploy_a_system.sh b/deploy_a_system.sh index 04d25ee..a371abb 100755 --- a/deploy_a_system.sh +++ b/deploy_a_system.sh @@ -5,8 +5,8 @@ set -ex cluster_name="$1" -definitions_dir=definitions -ybd_dir=/home/patrickdarley/ybd +definitions_dir=$(pwd)/definitions +ybd_dir=$(pwd)/ybd # Can only deploy with a single instance of ybd. Crashes # with >1 diff --git a/triggers/builders_trigger.sh b/triggers/builders_trigger.sh index dc568af..b2e2726 100644 --- a/triggers/builders_trigger.sh +++ b/triggers/builders_trigger.sh @@ -1,3 +1,11 @@ set -ex echo "[$(date "+%F %R")] Builder triggered. $1" >> ../../../../trigger_log + +if [ -d ybd ]; then + rm -rf ybd +fi +git clone https://github.com/devcurmudgeon/ybd.git +cd ybd +git checkout 15.38 +cd .. python builder_logic.py $1 diff --git a/triggers/deploy_trigger.sh b/triggers/deploy_trigger.sh index 20c72e8..b30d729 100644 --- a/triggers/deploy_trigger.sh +++ b/triggers/deploy_trigger.sh @@ -11,4 +11,11 @@ git checkout $BUILDSLAVE_SCRIPTS_SHA cd definitions git checkout $DEFINITIONS_SHA cd .. +if [ -d ybd ]; then + rm -rf ybd +fi +git clone https://github.com/devcurmudgeon/ybd.git +cd ybd +git checkout 15.38 +cd .. python deploy_logic.py $SYSTEM $ARTEFACT $TESING_SHA |