From e70fec41028c9721cf84a3bab81869d810d4c046 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Wed, 15 Jan 2020 19:20:02 +0800 Subject: [PATCH] Fix Failed to upload bug --- ci/jenkins/step/coverage.groovy | 5 +++-- docker/build_env/cpu/centos7/Dockerfile | 4 +++- docker/build_env/cpu/ubuntu16.04/Dockerfile | 2 ++ docker/build_env/cpu/ubuntu18.04/Dockerfile | 2 ++ docker/build_env/gpu/centos7/Dockerfile | 2 ++ docker/build_env/gpu/ubuntu16.04/Dockerfile | 2 ++ docker/build_env/gpu/ubuntu18.04/Dockerfile | 2 ++ docker/test_env/Dockerfile | 5 ++++- 8 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ci/jenkins/step/coverage.groovy b/ci/jenkins/step/coverage.groovy index 739c792d..167f0bcd 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 d9883cd1..80db8d2a 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 f703d736..add4ce5f 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 dca71b62..0f8b696d 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 e13d4fa8..185aad65 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 bf2ebc6e..c443b9b1 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 f23b5170..ab636ac7 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 ba8ac8b8..f913e7b2 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 -- GitLab