!419 CI adds code coverage analysis

Merge pull request !419 from JingWoo/master

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 \

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

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