From 8c7e735ef1563533a7149dc38fead91993a7c7a8 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Wed, 14 Aug 2019 17:32:52 +0800 Subject: [PATCH] update build.sh Former-commit-id: 465e01f2211bd0c546cf2313b5d9be32b5ecb2ee --- ci/jenkinsfile/milvus_build.groovy | 5 ++++- cpp/build.sh | 5 +---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/jenkinsfile/milvus_build.groovy b/ci/jenkinsfile/milvus_build.groovy index 559e4c7e..db5a0fea 100644 --- a/ci/jenkinsfile/milvus_build.groovy +++ b/ci/jenkinsfile/milvus_build.groovy @@ -3,15 +3,18 @@ container('milvus-build-env') { gitlabCommitStatus(name: 'Build Engine') { dir ("milvus_engine") { try { + def knowhere_build_dir = "${env.WORKSPACE}/milvus_engine/cpp/thirdparty/knowhere/cmake_build" + checkout([$class: 'GitSCM', branches: [[name: "${SEMVER}"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'SubmoduleOption',disableSubmodules: false,parentCredentials: true,recursiveSubmodules: true,reference: '',trackingSubmodules: false]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: "${params.GIT_USER}", url: "git@192.168.1.105:megasearch/milvus.git", name: 'origin', refspec: "+refs/heads/${SEMVER}:refs/remotes/origin/${SEMVER}"]]]) dir ("cpp/thirdparty/knowhere") { checkout([$class: 'GitSCM', branches: [[name: "${SEMVER}"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'SubmoduleOption',disableSubmodules: false,parentCredentials: true,recursiveSubmodules: true,reference: '',trackingSubmodules: false]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: "${params.GIT_USER}", url: "git@192.168.1.105:megasearch/knowhere.git", name: 'origin', refspec: "+refs/heads/${SEMVER}:refs/remotes/origin/${SEMVER}"]]]) + sh "./build.sh -t ${params.BUILD_TYPE} -p ${knowhere_build_dir} -j" } dir ("cpp") { sh "git config --global user.email \"test@zilliz.com\"" sh "git config --global user.name \"test\"" - sh "./build.sh -t ${params.BUILD_TYPE} -j -u -c" + sh "./build.sh -t ${params.BUILD_TYPE} -k ${knowhere_build_dir} -j -u -c" } } catch (exc) { updateGitlabCommitStatus name: 'Build Engine', state: 'failed' diff --git a/cpp/build.sh b/cpp/build.sh index 104ecc89..450e0815 100755 --- a/cpp/build.sh +++ b/cpp/build.sh @@ -10,15 +10,13 @@ DB_PATH="/opt/milvus" PROFILING="OFF" BUILD_FAISS_WITH_MKL="OFF" USE_JFROG_CACHE="OFF" -KNOWHERE_OPTS="" -KNOWHERE_BUILD_DIR="`pwd`/thirdparty/knowhere/knowhere" +KNOWHERE_BUILD_DIR="`pwd`/thirdparty/knowhere/cmake_build" while getopts "p:d:t:k:uhlrcgmj" arg do case $arg in t) BUILD_TYPE=$OPTARG # BUILD_TYPE - KNOWHERE_OPTS="${KNOWHERE_OPTS} -t $OPTARG" ;; u) echo "Build and run unittest cases" ; @@ -53,7 +51,6 @@ do ;; j) USE_JFROG_CACHE="ON" - KNOWHERE_OPTS="${KNOWHERE_OPTS} -j" ;; h) # help echo " -- GitLab