Unverified Commit c974392b authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #659 from ZhifengZhang-CN/0.6.0 

Change milvus deploy path to /var/lib/milvus
parents dc23981f 6570b639

ci/jenkins/Jenkinsfile

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ pipeline { 


    environment {

        PROJECT_NAME = "milvus"

        MILVUS_ROOT_PATH="/var/lib"

        MILVUS_INSTALL_PREFIX="${env.MILVUS_ROOT_PATH}/${env.PROJECT_NAME}"

        LOWER_BUILD_TYPE = params.BUILD_TYPE.toLowerCase()

        SEMVER = "${BRANCH_NAME.contains('/') ? BRANCH_NAME.substring(BRANCH_NAME.lastIndexOf('/') + 1) : BRANCH_NAME}"

        PIPELINE_NAME = "${env.JOB_NAME.contains('/') ? env.JOB_NAME.getAt(0..(env.JOB_NAME.indexOf('/') - 1)) : env.JOB_NAME}"

ci/jenkins/internalJenkinsfile.groovy

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ pipeline { 


    environment {

        PROJECT_NAME = "milvus"

        MILVUS_ROOT_PATH="/var/lib"

        MILVUS_INSTALL_PREFIX="${env.MILVUS_ROOT_PATH}/${env.PROJECT_NAME}"

        LOWER_BUILD_TYPE = params.BUILD_TYPE.toLowerCase()

        SEMVER = "${BRANCH_NAME.contains('/') ? BRANCH_NAME.substring(BRANCH_NAME.lastIndexOf('/') + 1) : BRANCH_NAME}"

        PIPELINE_NAME = "${env.JOB_NAME.contains('/') ? env.JOB_NAME.getAt(0..(env.JOB_NAME.indexOf('/') - 1)) : env.JOB_NAME}"

ci/jenkins/step/build.groovy

+2 −2
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ timeout(time: 60, unit: 'MINUTES') { 
        withCredentials([usernamePassword(credentialsId: "${params.JFROG_CREDENTIALS_ID}", usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {

            def checkResult = sh(script: "./check_ccache.sh -l ${params.JFROG_ARTFACTORY_URL}/ccache", returnStatus: true)

            if ("${env.BINRARY_VERSION}" == "gpu") {

                sh ". ./before-install.sh && ./build.sh -t ${params.BUILD_TYPE} -o /opt/milvus -l -g -x -u -c"

                sh ". ./before-install.sh && ./build.sh -t ${params.BUILD_TYPE} -o ${env.MILVUS_INSTALL_PREFIX} -l -g -x -u -c"

            } else {

                sh ". ./before-install.sh && ./build.sh -t ${params.BUILD_TYPE} -o /opt/milvus -l -u -c"

                sh ". ./before-install.sh && ./build.sh -t ${params.BUILD_TYPE} -o ${env.MILVUS_INSTALL_PREFIX} -l -u -c"

            }

            sh "./update_ccache.sh -l ${params.JFROG_ARTFACTORY_URL}/ccache -u ${USERNAME} -p ${PASSWORD}"

        }

ci/jenkins/step/coverage.groovy

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

    dir ("ci/scripts") {

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

        sh "./coverage.sh -o ${env.MILVUS_INSTALL_PREFIX} -u root -p 123456 -t \$POD_IP"

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

        withCredentials([[$class: 'StringBinding', credentialsId: "${env.PIPELINE_NAME}-codecov-token", variable: 'CODECOV_TOKEN']]) {

            sh 'curl -s https://codecov.io/bash | bash -s - -f output_new.info || echo "Codecov did not collect coverage reports"'

ci/jenkins/step/internalCoverage.groovy

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

    dir ("ci/scripts") {

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

        sh "./coverage.sh -o ${env.MILVUS_INSTALL_PREFIX} -u root -p 123456 -t \$POD_IP"

    }

}