From 3fee1c88bf121066803f02f671209e7dec66ad27 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Wed, 15 Jan 2020 14:00:41 +0800 Subject: [PATCH] Format Codecov --- ci/jenkins/step/coverage.groovy | 2 +- ci/scripts/check_ccache.sh | 42 ++++++++++++++++++++++++++------- ci/scripts/update_ccache.sh | 17 +++++++++++++ 3 files changed, 51 insertions(+), 10 deletions(-) diff --git a/ci/jenkins/step/coverage.groovy b/ci/jenkins/step/coverage.groovy index 281c4ef0..d4f28893 100644 --- a/ci/jenkins/step/coverage.groovy +++ b/ci/jenkins/step/coverage.groovy @@ -1,6 +1,7 @@ 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 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\"" @@ -12,4 +13,3 @@ timeout(time: 30, unit: 'MINUTES') { } } } - diff --git a/ci/scripts/check_ccache.sh b/ci/scripts/check_ccache.sh index 076738ce..e878ce94 100755 --- a/ci/scripts/check_ccache.sh +++ b/ci/scripts/check_ccache.sh @@ -40,32 +40,56 @@ if [[ -z "${ARTIFACTORY_URL}" || "${ARTIFACTORY_URL}" == "" ]];then exit 1 fi -check_ccache() { + +PACKAGE_FILE="ccache-${OS_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz" + +function check_ccache() { BRANCH=$1 - PACKAGE_FILE="ccache-${OS_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz" echo "fetching ${BRANCH}/${PACKAGE_FILE}" wget -q --spider "${ARTIFACTORY_URL}/${BRANCH}/${PACKAGE_FILE}" + return $? +} + +function download_file() { + BRANCH=$1 + wget -q "${ARTIFACTORY_URL}/${BRANCH}/${PACKAGE_FILE}" && \ + mkdir -p ${CCACHE_DIRECTORY} && \ + tar zxf ${PACKAGE_FILE} -C ${CCACHE_DIRECTORY} && \ + rm ${PACKAGE_FILE} + return $? +} + +if [[ -n "${CHANGE_TARGET}" && "${BRANCH_NAME}" =~ "PR-" ]];then + check_ccache ${CHANGE_TARGET} if [[ $? == 0 ]];then - wget -q "${ARTIFACTORY_URL}/${BRANCH}/${PACKAGE_FILE}" && \ - mkdir -p ${CCACHE_DIRECTORY} && \ - tar zxf ${PACKAGE_FILE} -C ${CCACHE_DIRECTORY} && \ - rm ${PACKAGE_FILE} + download_file ${CHANGE_TARGET} if [[ $? == 0 ]];then echo "found cache" exit 0 fi fi -} -if [[ -n "${CHANGE_TARGET}" && "${BRANCH_NAME}" =~ "PR-" ]];then - check_ccache ${CHANGE_TARGET} check_ccache ${BRANCH_NAME} + if [[ $? == 0 ]];then + download_file ${BRANCH_NAME} + if [[ $? == 0 ]];then + echo "found cache" + exit 0 + fi + fi fi for CURRENT_BRANCH in ${BRANCH_NAMES} do if [[ "${CURRENT_BRANCH}" != "HEAD" ]];then check_ccache ${CURRENT_BRANCH} + if [[ $? == 0 ]];then + download_file ${CURRENT_BRANCH} + if [[ $? == 0 ]];then + echo "found cache" + exit 0 + fi + fi fi done diff --git a/ci/scripts/update_ccache.sh b/ci/scripts/update_ccache.sh index ec52bd11..ec8929ff 100755 --- a/ci/scripts/update_ccache.sh +++ b/ci/scripts/update_ccache.sh @@ -51,6 +51,23 @@ if [[ -z "${ARTIFACTORY_URL}" || "${ARTIFACTORY_URL}" == "" ]];then fi PACKAGE_FILE="ccache-${OS_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz" + +function check_ccache() { + BRANCH=$1 + echo "fetching ${BRANCH}/${PACKAGE_FILE}" + wget -q --spider "${ARTIFACTORY_URL}/${BRANCH}/${PACKAGE_FILE}" + return $? +} + + +if [[ -n "${CHANGE_TARGET}" && "${BRANCH_NAME}" =~ "PR-" ]]; then + REMOTE_PACKAGE_PATH="${ARTIFACTORY_URL}/${BRANCH_NAME}" + check_ccache ${CHANGE_TARGET} + if [[ $? == 0 ]];then + echo "Skip Update ccache package ..." && exit 0 + fi +fi + REMOTE_PACKAGE_PATH="${ARTIFACTORY_URL}/${BRANCH_NAME}" ccache --show-stats -- GitLab