Commit 728d32c9 authored by zhiru's avatar zhiru
Browse files

Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0 


Former-commit-id: 7157af3073104c81ba9cc90fba34d4ad45a48394
parents d221342d e65468a4

.clang-format

+7 −0
Original line number Diff line number Diff line
@@ -18,3 +18,10 @@ 
BasedOnStyle:  Google

DerivePointerAlignment: false

ColumnLimit: 120

IndentWidth: 4

AccessModifierOffset: -3

AlwaysBreakAfterReturnType: All

AllowShortBlocksOnASingleLine: false

AllowShortFunctionsOnASingleLine: false

AllowShortIfStatementsOnASingleLine: false

AlignTrailingComments: true

.clang-tidy

+3 −1
Original line number Diff line number Diff line
@@ -18,8 +18,10 @@ 
Checks:          'clang-diagnostic-*,clang-analyzer-*,-clang-analyzer-alpha*,google-*,modernize-*,readability-*'

# produce HeaderFilterRegex from cpp/build-support/lint_exclusions.txt with:

# echo -n '^('; sed -e 's/*/\.*/g' cpp/build-support/lint_exclusions.txt | tr '\n' '|'; echo ')$'

HeaderFilterRegex: '^(.*cmake-build-debug.*|.*cmake-build-release.*|.*cmake_build.*|.*src/thirdparty.*|.*src/core/thirdparty.*|.*src/grpc.*|)$'

HeaderFilterRegex: '^(.*cmake-build-debug.*|.*cmake-build-release.*|.*cmake_build.*|.*src/core/thirdparty.*|.*thirdparty.*|.*easylogging++.*|.*SqliteMetaImpl.cpp|.*src/grpc.*|.*src/core.*|.*src/wrapper.*)$'

AnalyzeTemporaryDtors: true

ChainedConditionalReturn: 1

ChainedConditionalAssignment: 1

CheckOptions:

  - key:             google-readability-braces-around-statements.ShortStatementLines

    value:           '1'

ci/jenkinsfile/dev_test.groovy

+1 −2
Original line number Diff line number Diff line
@@ -2,10 +2,9 @@ timeout(time: 30, unit: 'MINUTES') { 
    try {

        dir ("${PROJECT_NAME}_test") {

            checkout([$class: 'GitSCM', branches: [[name: "${SEMVER}"]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: "${params.GIT_USER}", url: "git@192.168.1.105:Test/milvus_test.git", name: 'origin', refspec: "+refs/heads/${SEMVER}:refs/remotes/origin/${SEMVER}"]]])

            sh 'python3 -m pip install -r requirements.txt'

            sh 'python3 -m pip install -r requirements.txt -i http://pypi.douban.com/simple --trusted-host pypi.douban.com'

            sh "pytest . --alluredir=\"test_out/dev/single/sqlite\" --level=1 --ip ${env.JOB_NAME}-${env.BUILD_NUMBER}-milvus-gpu-engine.milvus-1.svc.cluster.local"

        }



        // mysql database backend test

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

ci/jenkinsfile/dev_test_all.groovy

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ timeout(time: 60, unit: 'MINUTES') { 
    try {

        dir ("${PROJECT_NAME}_test") {

            checkout([$class: 'GitSCM', branches: [[name: "${SEMVER}"]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: "${params.GIT_USER}", url: "git@192.168.1.105:Test/milvus_test.git", name: 'origin', refspec: "+refs/heads/${SEMVER}:refs/remotes/origin/${SEMVER}"]]])

            sh 'python3 -m pip install -r requirements.txt'

            sh 'python3 -m pip install -r requirements.txt -i http://pypi.douban.com/simple --trusted-host pypi.douban.com'

            sh "pytest . --alluredir=\"test_out/dev/single/sqlite\" --ip ${env.JOB_NAME}-${env.BUILD_NUMBER}-milvus-gpu-engine.milvus-1.svc.cluster.local"

        }

ci/jenkinsfile/milvus_build.groovy

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ container('milvus-build-env') { 
                        sh "git config --global user.email \"test@zilliz.com\""

                        sh "git config --global user.name \"test\""

                        withCredentials([usernamePassword(credentialsId: "${params.JFROG_USER}", usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {

                            sh "./build.sh -l"

                            sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -j -u -c"

                        }

                    }