summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorYao Lu <lu.yao135@zte.com.cn>2017-01-18 15:28:49 +0800
committerYao Lu <lu.yao135@zte.com.cn>2017-01-19 08:45:50 +0000
commitf8b77d0c9112aa97cc079bb718e530a1caa6d1ef (patch)
tree1b69d5a5272885f8f8633fd5efd8f92b1b4a1f7b /ci
parent2c0db26e12bd58f8894e282b27d40c8551e58acb (diff)
remove centos7.qcow2
every time before deploy,we need new centos7.qcow2. Change-Id: I295ed192674a31290b25042c0843875b93831ebc Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy/deploy.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index 59ed544b..1419642e 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -106,8 +106,8 @@ function clean_up
echo "=====clean up all node and network======"
clean_up all_in_one daisy2
clean_up daisy daisy1
-if [ -f $WORKDIR/daisy ]; then
- rm -rf $WORKDIR
+if [ -f $WORKDIR/daisy/centos7.qcow2 ]; then
+ rm -rf $WORKDIR/daisy/centos7.qcow2
fi
echo "=======create daisy node================"
@@ -154,6 +154,7 @@ echo "===========check install progress==========="
execute_on_jumpserver $daisy_ip "systemctl restart daisy-api"
execute_on_jumpserver $daisy_ip "systemctl restart daisy-registry"
execute_on_jumpserver $daisy_ip "${REMOTE_SPACE}/deploy/check_os_progress.sh"
+sleep 10
virsh reboot all_in_one
execute_on_jumpserver $daisy_ip "${REMOTE_SPACE}/deploy/check_openstack_progress.sh"