added update_leap_cli and update_platform, make it running properly in a screen session

1 files changed, 25 insertions, 1 deletions

diff --git a/leap-platform-test b/leap-platform-test
index cdf7d84..dad35e9 100755
--- a/leap-platform-test
+++ b/leap-platform-test
@@ -102,6 +102,7 @@ deploy() {
   FILTER_PUPPET='] notice: |] No change to hostname|] Puppet apply complete|] warning: Dynamic lookup|] warning: Scope\(Class'
   FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET)"
 
+
   for vm in $@
   do
     [ -e $LOGDIR ] || mkdir -p $LOGDIR
@@ -141,6 +142,11 @@ get_ip () {
 
 reset_deploy() {
 
+  update_platform
+  update_leap_cli
+
+  cd $PROVIDERDIR
+
   log_start
   compile
 
@@ -152,6 +158,11 @@ reset_deploy() {
     wait_for_node $i
     deploy $i &
   done
+
+  # needed in a detached screen session, otherwise it would terminate before deploy jobs 
+  # have finished
+  echo "Waiting for last deploy process has finished..."
+  wait
 }
 
 log_start() {
@@ -176,7 +187,20 @@ wait_for_node() {
   done
 }
 
-# beginning of version check
+update_leap_cli () {
+  cd /usr/local/src/leap_cli
+  git fetch
+  git reset origin/vagrant_1.2 --hard 
+  /usr/bin/rake build 
+  sudo /usr/bin/rake install
+}
+
+
+update_platform () {
+  cd $PLATFORMDIR
+  git pull
+}
+
 versions () {
   cd $PLATFORMDIR
   platform_head=`git rev-parse HEAD`