diff --git a/CI/Dockerfile b/CI/Dockerfile
index 12ad906924517add66e65c79625d8ded2efe8099..de273a5f48c524f74e3b7ba93c28cdbb9a8cc29e 100644
--- a/CI/Dockerfile
+++ b/CI/Dockerfile
@@ -65,6 +65,8 @@ RUN yum clean all && yum makecache && yum install -y epel-release && yum swap -y
 			device-mapper-devel \
 			libarchive \
 			libarchive-devel \
+			libtar \
+			libtar-devel \
 			libcurl-devel \
 			zlib-devel \
 			glibc-headers \
diff --git a/CI/build.sh b/CI/build.sh
index 6929b241b00c7f77819f4d42025b237ec726cda7..fddde51dd9d1ad3a404d239ef596f00a79eb7035 100755
--- a/CI/build.sh
+++ b/CI/build.sh
@@ -399,14 +399,16 @@ if [[ "x${enable_gcov}" == "xON" ]]; then
   tar xf ./isulad-gcov.tar.gz
   rm -rf /var/www/html/isulad-gcov
   rm -rf /var/www/html/isulad-gcov.tar.gz
-  mv ./tmp/isulad-gcov /var/www/html
+  mv ./tmp/isulad-gcov /var/www/html/isulad-gcov
   cp isulad-gcov.tar.gz /var/www/html
+  rm -rf ./tmp
 
   tar xf ./isulad-llt-gcov.tar.gz
   rm -rf /var/www/html/isulad-llt-gcov
   rm -rf /var/www/html/isulad-llt-gcov.tar.gz
-  mv ./coverage /var/www/html
+  mv ./coverage /var/www/html/isulad-llt-gcov
   cp isulad-llt-gcov.tar.gz /var/www/html
+  rm -rf ./coverage
 fi
 
 if [[ -e $CIDIR/${CONTAINER_NAME}.runflag ]]; then
@@ -415,13 +417,17 @@ if [[ -e $CIDIR/${CONTAINER_NAME}.runflag ]]; then
     for container in ${containers[@]}
     do
         docker rm -f $container
+        rm -rf /var/lib/isulad/$container
     done
+    rm -rf /var/lib/isulad/${CONTAINER_NAME}_cptemp
     exit 0;
 else
     for container in ${containers[@]}
     do
         docker rm -f $container
+        rm -rf /var/lib/isulad/$container
     done
+    rm -rf /var/lib/isulad/${CONTAINER_NAME}_cptemp
     echo_error "Test failed!"
     exit -1;
 fi
diff --git a/CI/generate_gcov.sh b/CI/generate_gcov.sh
index 41444c4c330a9a5d0a891ec507d3c65c61743592..0a5de6272c2e6a5faf28b2332b1c50bbbe0d567e 100755
--- a/CI/generate_gcov.sh
+++ b/CI/generate_gcov.sh
@@ -13,8 +13,8 @@ echo "*****************Get iSulad GCOV data**************************"
 cp -r ~/build $ISULAD_COPY_PATH
 cd $ISULAD_COPY_PATH/build/src/CMakeFiles
 lcov -c -o isulad.info -d isulad.dir
-lcov -c -o isula.info -d isula.dir/src
-lcov -c -o isulad-shim.info -d isulad-shim.dir/src
+lcov -c -o isula.info -d isula.dir
+lcov -c -o isulad-shim.info -d isulad-shim.dir
 lcov -c -o libisula.info -d libisula.dir
 
 # Remove std files
diff --git a/CI/make-and-install.sh b/CI/make-and-install.sh
index 1929863eb89738022e8760ccf5eb898caa32d1b4..6646bb2abacdbf30b72c2f29f5046153e5b3b235 100755
--- a/CI/make-and-install.sh
+++ b/CI/make-and-install.sh
@@ -90,32 +90,28 @@ echo_success "===================RUN DT-LLT TESTCASES END=======================
 cd $ISULAD_COPY_PATH
 sed -i 's/fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO/fd == 0 || fd == 1 || fd == 2 || fd >= 1000/g' ./src/cutils/utils.c
 
-#build grpc version
+# build rest version
+cd $ISULAD_COPY_PATH
 rm -rf build
 mkdir build
 cd build
-if [[ ${enable_gcov} -ne 1 ]]; then
-  cmake -DLIB_INSTALL_DIR=${builddir}/lib -DCMAKE_INSTALL_PREFIX=${builddir} -DCMAKE_INSTALL_SYSCONFDIR=${builddir}/etc -DCMAKE_BUILD_TYPE=debug -DGCOV=ON -DENABLE_EMBEDDED=ON ..
-else
-  cmake -DLIB_INSTALL_DIR=${builddir}/lib -DCMAKE_INSTALL_PREFIX=${builddir} -DCMAKE_INSTALL_SYSCONFDIR=${builddir}/etc -DENABLE_EMBEDDED=ON ..
-fi
+cmake -DLIB_INSTALL_DIR=${restbuilddir}/lib -DCMAKE_INSTALL_PREFIX=${restbuilddir} -DCMAKE_INSTALL_SYSCONFDIR=${restbuilddir}/etc -DENABLE_EMBEDDED=ON -DENABLE_GRPC=OFF -DDISABLE_OCI=ON ..
 make -j $(nproc)
 make install
-sed -i 's/"log-driver": "stdout"/"log-driver": "file"/g' ${builddir}/etc/isulad/daemon.json
-sed -i "/registry-mirrors/a\        \"https://hub-mirror.c.163.com\"" ${builddir}/etc/isulad/daemon.json
+sed -i 's/"log-driver": "stdout"/"log-driver": "file"/g' ${restbuilddir}/etc/isulad/daemon.json
+sed -i "/registry-mirrors/a\        \"https://hub-mirror.c.163.com\"" ${restbuilddir}/etc/isulad/daemon.json
 
-# build rest version
+#build grpc version
 cd $ISULAD_COPY_PATH
 rm -rf build
 mkdir build
 cd build
-
 if [[ ${enable_gcov} -ne 0 ]]; then
-  cmake -DLIB_INSTALL_DIR=${restbuilddir}/lib -DCMAKE_INSTALL_PREFIX=${restbuilddir} -DCMAKE_INSTALL_SYSCONFDIR=${restbuilddir}/etc -DCMAKE_BUILD_TYPE=debug -DGCOV=ON -DENABLE_EMBEDDED=ON -DENABLE_GRPC=OFF -DDISABLE_OCI=ON ..
+  cmake -DLIB_INSTALL_DIR=${builddir}/lib -DCMAKE_INSTALL_PREFIX=${builddir} -DCMAKE_INSTALL_SYSCONFDIR=${builddir}/etc -DCMAKE_BUILD_TYPE=debug -DGCOV=ON -DENABLE_EMBEDDED=ON ..
 else
-  cmake -DLIB_INSTALL_DIR=${restbuilddir}/lib -DCMAKE_INSTALL_PREFIX=${restbuilddir} -DCMAKE_INSTALL_SYSCONFDIR=${restbuilddir}/etc -DENABLE_EMBEDDED=ON -DENABLE_GRPC=OFF -DDISABLE_OCI=ON ..
+  cmake -DLIB_INSTALL_DIR=${builddir}/lib -DCMAKE_INSTALL_PREFIX=${builddir} -DCMAKE_INSTALL_SYSCONFDIR=${builddir}/etc -DENABLE_EMBEDDED=ON ..
 fi
 make -j $(nproc)
 make install
-sed -i 's/"log-driver": "stdout"/"log-driver": "file"/g' ${restbuilddir}/etc/isulad/daemon.json
-sed -i "/registry-mirrors/a\        \"https://hub-mirror.c.163.com\"" ${restbuilddir}/etc/isulad/daemon.json
+sed -i 's/"log-driver": "stdout"/"log-driver": "file"/g' ${builddir}/etc/isulad/daemon.json
+sed -i "/registry-mirrors/a\        \"https://hub-mirror.c.163.com\"" ${builddir}/etc/isulad/daemon.json