diff options
| author |   Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2017-03-03 09:03:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-03 09:03:20 +0000 |
| commit | 35b6ee18ef8a4c3ee2b51c7447942d79941b06d1 (patch) | |
| tree | 700a69fdf3f2d754cb854503d2b60df590866165 /ci | |
| parent | 955030c520dc78c7da6b1d056e6e1ff64188df5e (diff) | |
| parent | 6aa0d065c6d8f341a7307cf69e6afec2e2bdc682 (diff) | |
Merge "End deployment when timeout"
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy/deploy.sh | 8 |
1 files changed, 7 insertions, 1 deletions
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 |