diff --git a/ci/jenkins/step/coverage.groovy b/ci/jenkins/step/coverage.groovy index 739c792d4b828388265204107dda9fecbb0061d1..167f0bcd181fd53ad0bddc72c9362536448104bf 100644 --- a/ci/jenkins/step/coverage.groovy +++ b/ci/jenkins/step/coverage.groovy @@ -2,13 +2,14 @@ timeout(time: 30, unit: 'MINUTES') { dir ("ci/scripts") { sh "./coverage.sh -o ${env.MILVUS_INSTALL_PREFIX} -u root -p 123456 -t \$POD_IP" boolean isNightlyTest = currentBuild.getBuildCauses('hudson.triggers.TimerTrigger$TimerTriggerCause').size() != 0 ? true : false + String formatFlag = "${BINARY_VERSION}-version-${OS_NAME}-unittest".replaceAll("\\.", "_").replaceAll("-", "_") if (isNightlyTest) { withCredentials([[$class: 'StringBinding', credentialsId: "milvus-ci-codecov-token", variable: 'CODECOV_TOKEN']]) { - sh "curl -s https://codecov.io/bash | bash -s - -f output_new.info -n ${BINARY_VERSION}-version-${OS_NAME}-unittest -F nightly -F ${BINARY_VERSION}_version_${OS_NAME}_unittest || echo \"Codecov did not collect coverage reports\"" + sh "curl -s https://codecov.io/bash | bash -s - -f output_new.info -n ${formatFlag} -F nightly -F ${BINARY_VERSION}_version_${OS_NAME}_unittest || echo \"Codecov did not collect coverage reports\"" } } else { withCredentials([[$class: 'StringBinding', credentialsId: "milvus-ci-codecov-token", variable: 'CODECOV_TOKEN']]) { - sh "curl -s https://codecov.io/bash | bash -s - -f output_new.info -n ${BINARY_VERSION}-version-${OS_NAME}-unittest -F ${BINARY_VERSION}_version_${OS_NAME}_unittest || echo \"Codecov did not collect coverage reports\"" + sh "curl -s https://codecov.io/bash | bash -s - -f output_new.info -n ${formatFlag} -F ${BINARY_VERSION}_version_${OS_NAME}_unittest || echo \"Codecov did not collect coverage reports\"" } } } diff --git a/docker/build_env/cpu/centos7/Dockerfile b/docker/build_env/cpu/centos7/Dockerfile index d9883cd1b43b1b5fcf9b379879a1ef59c11b2c2e..80db8d2a805c004f5168368fb873b53f7f78aa7a 100644 --- a/docker/build_env/cpu/centos7/Dockerfile +++ b/docker/build_env/cpu/centos7/Dockerfile @@ -1,5 +1,7 @@ FROM centos:centos7 +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + RUN yum install -y epel-release centos-release-scl-rh && yum install -y wget curl which && \ wget -qO- "https://cmake.org/files/v3.14/cmake-3.14.3-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local && \ yum install -y ccache make automake git python3-pip libcurl-devel python3-devel boost-static mysql-devel \ @@ -18,4 +20,4 @@ COPY docker-entrypoint.sh /app/docker-entrypoint.sh WORKDIR /root ENTRYPOINT [ "/app/docker-entrypoint.sh" ] -CMD [ "start" ] \ No newline at end of file +CMD [ "start" ] diff --git a/docker/build_env/cpu/ubuntu16.04/Dockerfile b/docker/build_env/cpu/ubuntu16.04/Dockerfile index f703d736bbc36ca41cb4f8536d1f181fdf7310f9..add4ce5f9be97ab0c480d81c9afd8acd46f132c9 100644 --- a/docker/build_env/cpu/ubuntu16.04/Dockerfile +++ b/docker/build_env/cpu/ubuntu16.04/Dockerfile @@ -2,6 +2,8 @@ FROM ubuntu:16.04 ENV DEBIAN_FRONTEND noninteractive +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + RUN apt-get update && apt-get install -y --no-install-recommends wget ca-certificates gnupg2 apt-transport-https && \ wget -P /tmp https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB && \ apt-key add /tmp/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB && \ diff --git a/docker/build_env/cpu/ubuntu18.04/Dockerfile b/docker/build_env/cpu/ubuntu18.04/Dockerfile index dca71b62179e951d8812761b478a1fc513faf228..0f8b696db48291c51a65a088fcfc7f4683727483 100644 --- a/docker/build_env/cpu/ubuntu18.04/Dockerfile +++ b/docker/build_env/cpu/ubuntu18.04/Dockerfile @@ -2,6 +2,8 @@ FROM ubuntu:18.04 ENV DEBIAN_FRONTEND noninteractive +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + RUN apt-get update && apt-get install -y --no-install-recommends wget ca-certificates gnupg2 && \ wget -P /tmp https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB && \ apt-key add /tmp/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB && \ diff --git a/docker/build_env/gpu/centos7/Dockerfile b/docker/build_env/gpu/centos7/Dockerfile index e13d4fa86a9400ae7b47052380213453794c3c87..185aad65554ee9db2a49b335f1a6d4a63bd73ad9 100644 --- a/docker/build_env/gpu/centos7/Dockerfile +++ b/docker/build_env/gpu/centos7/Dockerfile @@ -2,6 +2,8 @@ FROM nvidia/cuda:10.1-devel-centos7 ENV NVIDIA_DRIVER_CAPABILITIES compute,utility +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + RUN yum install -y epel-release centos-release-scl-rh && yum install -y wget curl which && \ wget -qO- "https://cmake.org/files/v3.14/cmake-3.14.3-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local && \ yum install -y ccache make automake git python3-pip libcurl-devel python3-devel boost-static mysql-devel \ diff --git a/docker/build_env/gpu/ubuntu16.04/Dockerfile b/docker/build_env/gpu/ubuntu16.04/Dockerfile index bf2ebc6ef8c4e4ede40c0d56742c272ec3ca145d..c443b9b109f4b3d248cfe885c85ec1ad9860f14e 100644 --- a/docker/build_env/gpu/ubuntu16.04/Dockerfile +++ b/docker/build_env/gpu/ubuntu16.04/Dockerfile @@ -2,6 +2,8 @@ FROM nvidia/cuda:10.1-devel-ubuntu16.04 ENV NVIDIA_DRIVER_CAPABILITIES compute,utility +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + RUN apt-get update && apt-get install -y --no-install-recommends wget && \ wget -qO- "https://cmake.org/files/v3.14/cmake-3.14.3-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local && \ wget -P /tmp https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB && \ diff --git a/docker/build_env/gpu/ubuntu18.04/Dockerfile b/docker/build_env/gpu/ubuntu18.04/Dockerfile index f23b517024fc18a45bee054a2cb343f9561490c3..ab636ac7787a7ed1922e0f2da60cda14949978f9 100644 --- a/docker/build_env/gpu/ubuntu18.04/Dockerfile +++ b/docker/build_env/gpu/ubuntu18.04/Dockerfile @@ -2,6 +2,8 @@ FROM nvidia/cuda:10.1-devel-ubuntu18.04 ENV NVIDIA_DRIVER_CAPABILITIES compute,utility +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + RUN apt-get update && apt-get install -y --no-install-recommends wget && \ wget -qO- "https://cmake.org/files/v3.14/cmake-3.14.3-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local && \ wget -P /tmp https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB && \ diff --git a/docker/test_env/Dockerfile b/docker/test_env/Dockerfile index ba8ac8b87c4f2fa0204e56afaa349e6f8b48320a..f913e7b2d27a26a0dfadd846d1d428d3f41f32a9 100644 --- a/docker/test_env/Dockerfile +++ b/docker/test_env/Dockerfile @@ -1,5 +1,7 @@ FROM python:3.6.8-jessie +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + RUN apt-get update && apt-get install -y --no-install-recommends wget apt-transport-https && \ wget -qO- "https://get.helm.sh/helm-v3.0.2-linux-amd64.tar.gz" | tar --strip-components=1 -xz -C /usr/local/bin linux-amd64/helm && \ wget -P /tmp https://mirrors.aliyun.com/kubernetes/apt/doc/apt-key.gpg && \ @@ -7,7 +9,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget apt-transp sh -c 'echo deb https://mirrors.aliyun.com/kubernetes/apt/ kubernetes-xenial main > /etc/apt/sources.list.d/kubernetes.list' && \ apt-get update && apt-get install -y --no-install-recommends \ build-essential kubectl && \ - apt-get remove --purge -y + apt-get remove --purge -y && \ + rm -rf /var/lib/apt/lists/* COPY docker-entrypoint.sh /app/docker-entrypoint.sh WORKDIR /root