2 files changed, 8 insertions, 5 deletions
diff --git a/ci/build_rpm/build_rpms_docker.sh b/ci/build_rpm/build_rpms_docker.sh
index 55b2e164..caeb005b 100755
--- a/ci/build_rpm/build_rpms_docker.sh
+++ b/ci/build_rpm/build_rpms_docker.sh
@@ -14,7 +14,7 @@ rpm_build_dir=/opt/daisy4nfv
 rpm_output_dir=$rpm_build_dir/build_output
 tmp_rpm_build_dir=/home/cache/daisy4nfv
 
-DAISYCORE_TAG=1.3.0
+DAISYCORE_TAG=
 
 if [[ -d $tmp_rpm_build_dir ]]; then
     rm -fr $tmp_rpm_build_dir
@@ -41,7 +41,6 @@ do
     if [[ ! -z "$DAISYCORE_TAG" ]]; then
         pushd daisycloud-core
         git checkout $DAISYCORE_TAG
-        git fetch https://git.openstack.org/openstack/daisycloud-core refs/changes/91/441791/1 && git cherry-pick FETCH_HEAD
         popd
     fi
 
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index f81afe95..9fca1220 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -314,12 +314,14 @@ else
 fi
 
 echo "======prepare host and pxe==========="
-ssh $SSH_PARAS $DAISY_IP "python ${REMOTE_SPACE}/deploy/tempest.py  --dha $DHA --network $NETWORK --host 'yes' --env $IS_BARE"
+ssh $SSH_PARAS $DAISY_IP "python ${REMOTE_SPACE}/deploy/tempest.py  --dha $DHA --network $NETWORK --host 'yes' --isbare $IS_BARE"
 
-echo "======daisy deploy os and openstack==========="
+echo "======daisy virtual-deploy os and openstack==========="
 if [ $IS_BARE == 0 ];then
     virsh destroy all_in_one
     virsh start all_in_one
+    sleep 20
+    ssh $SSH_PARAS $DAISY_IP "python ${REMOTE_SPACE}/deploy/tempest.py  --install 'yes'"
 fi
 
 echo "===========check install progress==========="
@@ -340,9 +342,11 @@ fi
 
 if [ $IS_BARE == 0 ];then
     echo "============post deploy====================="
-    ssh $SSH_PARAS $DAISY_IP "python ${REMOTE_SPACE}/deploy/post/execute.py"
+    ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/post.sh -n $NETWORK"
 fi
 
+echo "============deploy success==================="
+
 exit 0
 
 #