From b52dade4c2d8ee662f22893c9527196e0074b20d Mon Sep 17 00:00:00 2001 From: Justin chi Date: Mon, 27 Mar 2017 06:19:06 +0000 Subject: Revert "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: Ifa57faed29e1055a35ab0e24b0026b520f395807 Signed-off-by: Justin chi --- deploy.sh | 6 ------ 1 file changed, 6 deletions(-) (limited to 'deploy.sh') diff --git a/deploy.sh b/deploy.sh index e29b518f..891eadf9 100755 --- a/deploy.sh +++ b/deploy.sh @@ -39,12 +39,6 @@ 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