Commit e555baa8 authored by 蔡宇东's avatar 蔡宇东
Browse files

Merge remote-tracking branch 'main/0.5.1' into 0.5.1 


Former-commit-id: 99c3c2a8b8bda14506da4916f6bd41ba688e3e11
parents b6bf40e5 3d6c9bb4

CHANGELOG.md

+4 −0
Original line number Diff line number Diff line
@@ -5,9 +5,13 @@ Please mark all change in change log and use the ticket from JIRA. 
# Milvus 0.5.1 (TODO)



## Bug

- \#104 - test_scheduler core dump



## Improvement

- \#64 - Improvement dump function in scheduler

- \#80 - Print version information into log during server start

- \#82 - Move easyloggingpp into "external" directory

- \#92 - Speed up CMake build process



## Feature

## Task

ci/jenkins/Jenkinsfile

+17 −1
Original line number Diff line number Diff line 
String cron_string = BRANCH_NAME == "master" ? "H 0 * * *" : ""

cron_string =  BRANCH_NAME == "0.5.1" ? "H 1 * * *" : cron_string



pipeline {

    agent none



    triggers { cron(cron_string) }



    options {

        timestamps()

    }
@@ -119,11 +124,16 @@ pipeline { 
                            steps {

                                container('milvus-test-env') {

                                    script {

                                        boolean isNightlyTest = isTimeTriggeredBuild()

                                        if (isNightlyTest) {

                                            load "${env.WORKSPACE}/ci/jenkins/jenkinsfile/singleDevNightlyTest.groovy"

                                        } else {

                                            load "${env.WORKSPACE}/ci/jenkins/jenkinsfile/singleDevTest.groovy"

                                        }

                                    }

                                }

                            }

                        }



                        stage ("Cleanup Dev") {

                            steps {
@@ -150,3 +160,9 @@ pipeline { 
    }

}



boolean isTimeTriggeredBuild() {

    if (currentBuild.getBuildCauses('hudson.triggers.TimerTrigger$TimerTriggerCause').size() != 0) {

        return true

    }

    return false

}

ci/jenkins/jenkinsfile/cleanupSingleDev.groovy

+4 −1
Original line number Diff line number Diff line 
try {

    def helmResult = sh script: "helm status ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-gpu", returnStatus: true

    if (!helmResult) {

        sh "helm del --purge ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-gpu"

    }

} catch (exc) {

    def helmResult = sh script: "helm status ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-gpu", returnStatus: true

    if (!helmResult) {

ci/jenkins/jenkinsfile/coverage.groovy

+1 −1
Original line number Diff line number Diff line 
timeout(time: 60, unit: 'MINUTES') {

timeout(time: 30, unit: 'MINUTES') {

    dir ("ci/jenkins/scripts") {

        sh "./coverage.sh -o /opt/milvus -u root -p 123456 -t \$POD_IP"

        // Set some env variables so codecov detection script works correctly

ci/jenkins/jenkinsfile/deploySingle2Dev.groovy

+7 −12
Original line number Diff line number Diff line 
try {

sh 'helm init --client-only --skip-refresh --stable-repo-url https://kubernetes.oss-cn-hangzhou.aliyuncs.com/charts'

sh 'helm repo update'

dir ('milvus-helm') {

    checkout([$class: 'GitSCM', branches: [[name: "0.5.0"]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: "${params.GIT_CREDENTIALS_ID}", url: "https://github.com/milvus-io/milvus-helm.git", name: 'origin', refspec: "+refs/heads/0.5.0:refs/remotes/origin/0.5.0"]]])

    dir ("milvus-gpu") {

            sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-gpu -f ci/values.yaml --namespace milvus ."

        sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-gpu -f ci/values.yaml -f ci/filebeat/values.yaml --namespace milvus ."

    }

}

} catch (exc) {

    echo 'Helm running failed!'

    sh "helm del --purge ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-gpu"

    throw exc

}