From 6aa0d065c6d8f341a7307cf69e6afec2e2bdc682 Mon Sep 17 00:00:00 2001
From: Alex Yang <yangyang1@zte.com.cn>
Date: Thu, 2 Mar 2017 20:08:35 +0800
Subject: End deployment when timeout

Change-Id: Iaae02bfc69450d6138b7b187ec23e4ed2eef6138
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
---
 ci/deploy/deploy.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'ci')

diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index 7f57d01a..e7aba37b 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -49,7 +49,7 @@ sudo `basename $0` -b base_path
                    -l zte -p pod2 -B pxebr
                    -d ./deploy/config/vm_environment/zte-virtual1/deploy.yml
                    -n ./deploy/config/vm_environment/zte-virtual1/network.yml
-                   -r /opt/daisy -w /opt/daisy -l zte -p pod2
+                   -r /opt/daisy -w /opt/daisy
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 EOF
 }
@@ -323,12 +323,18 @@ ssh $SSH_PARAS $DAISY_IP "systemctl restart daisy-registry"
 
 echo "===========check install progress==========="
 ssh $SSH_PARAS $DAISY_IP "${REMOTE_SPACE}/deploy/check_os_progress.sh -d $IS_BARE -n $TARGET_HOSTS_NUM"
+if [ $? -ne 0 ]; then
+    exit 1;
+fi
 sleep 10
 
 if [ $IS_BARE == 0 ];then
     virsh reboot all_in_one
 fi
 ssh $SSH_PARAS $DAISY_IP "${REMOTE_SPACE}/deploy/check_openstack_progress.sh"
+if [ $? -ne 0 ]; then
+    exit 1;
+fi
 
 exit 0
 
-- 
cgit 1.2.3-korg