From 88a7278e949b7a4bb777d9f36f0e27eade2b46d6 Mon Sep 17 00:00:00 2001
From: Harry Huang <huangxiangyu5@huawei.com>
Date: Thu, 23 Mar 2017 15:52:09 +0800
Subject: opera adapter fix2

* opera_adapter need sshpass which may cause deploy
fail
* compass log redirection is the last command which
always return 0 and thus cover deploy error

1. add installation of sshpass in prepare.sh
2. echo a string at the end of deploy/launch.sh into
log file to judge if deployment is complete
3. fix typing error in util/check_valid.py

Change-Id: Ic4bca50b2c316bf46cace45b9b3317ef9452a0ba
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
---
 deploy.sh | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'deploy.sh')

diff --git a/deploy.sh b/deploy.sh
index 891eadf9..e29b518f 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -39,6 +39,12 @@ if [[ -z $DEPLOY_COMPASS && -z $DEPLOY_HOST && -z $REDEPLOY_HOST ]]; then
 fi
 
 LOG_DIR=$COMPASS_DIR/work/deploy/log
+export LOG_DIR
+
 mkdir -p $LOG_DIR
 
 $COMPASS_DIR/deploy/launch.sh $* 2>&1 | tee $LOG_DIR/compass-deploy.log
+
+if [[ $(tail -1 $LOG_DIR/compass-deploy.log) != 'compass deploy success' ]]; then
+    exit 1
+fi
-- 
cgit 1.2.3-korg