diff options
Diffstat (limited to 'ci/deploy/deploy.sh')
| -rwxr-xr-x | ci/deploy/deploy.sh | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index f6fae37e..8c13776c 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 } @@ -187,9 +187,12 @@ if [ $DRY_RUN -eq 1 ]; then exit 1 fi -if [ ! -x ${WORKSPACE}/opnfv.bin ]; then - echo "opnfv.bin does not exist in WORKSPACE or is not executable, exit." +if [ ! -f ${WORKSPACE}/opnfv.bin ]; then + echo "opnfv.bin does not exist in WORKSPACE, exit." exit 1 +elif [ ! -x ${WORKSPACE}/opnfv.bin ]; then + echo "opnfv.bin in WORKSPACE is not executable, chmod it and continue." + chmod +x ${WORKSPACE}/opnfv.bin fi test -d ${VM_STORAGE} || mkdir -p ${VM_STORAGE} @@ -320,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 if [ $IS_BARE == 0 ];then |