From 844533ae5702889ae7611192178c285026f67f1e Mon Sep 17 00:00:00 2001 From: quicksilver Date: Thu, 28 Nov 2019 15:53:04 +0800 Subject: [PATCH 1/4] Intergrate internal FAISS --- ci/jenkins/Jenkinsfile | 5 ++--- ci/jenkins/internalJenkinsfile.groovy | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index 1989edc10c..e5ce23a805 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -27,9 +27,8 @@ pipeline { environment { PROJECT_NAME = "milvus" LOWER_BUILD_TYPE = params.BUILD_TYPE.toLowerCase() - SEMVER = "${BRANCH_NAME}" - JOBNAMES = env.JOB_NAME.split('/') - PIPELINE_NAME = "${JOBNAMES[0]}" + SEMVER = BRANCH_NAME.substring(BRANCH_NAME.lastIndexOf("/") + 1) + PIPELINE_NAME = env.JOB_NAME.getAt(0..(env.JOB_NAME.indexOf("/") - 1)) } stages { diff --git a/ci/jenkins/internalJenkinsfile.groovy b/ci/jenkins/internalJenkinsfile.groovy index 2987cfed81..cbe9c1dbb1 100644 --- a/ci/jenkins/internalJenkinsfile.groovy +++ b/ci/jenkins/internalJenkinsfile.groovy @@ -18,9 +18,8 @@ pipeline { environment { PROJECT_NAME = "milvus" LOWER_BUILD_TYPE = params.BUILD_TYPE.toLowerCase() - SEMVER = "${BRANCH_NAME}" - JOBNAMES = env.JOB_NAME.split('/') - PIPELINE_NAME = "${JOBNAMES[0]}" + SEMVER = BRANCH_NAME.substring(BRANCH_NAME.lastIndexOf("/") + 1) + PIPELINE_NAME = env.JOB_NAME.getAt(0..(env.JOB_NAME.indexOf("/") - 1)) } stages { From bb0fd6455117076a784edcccef2aa720fa16fe49 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Thu, 28 Nov 2019 16:02:24 +0800 Subject: [PATCH 2/4] Intergrate internal FAISS --- ci/jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index e5ce23a805..e86cec2676 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -27,7 +27,7 @@ pipeline { environment { PROJECT_NAME = "milvus" LOWER_BUILD_TYPE = params.BUILD_TYPE.toLowerCase() - SEMVER = BRANCH_NAME.substring(BRANCH_NAME.lastIndexOf("/") + 1) + SEMVER = BRANCH_NAME.contains("/") ? BRANCH_NAME.substring(BRANCH_NAME.lastIndexOf("/") + 1) : "${BRANCH_NAME}" PIPELINE_NAME = env.JOB_NAME.getAt(0..(env.JOB_NAME.indexOf("/") - 1)) } From 5c95d560a52b6055348dada6fce9097a13185ce9 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Thu, 28 Nov 2019 16:03:06 +0800 Subject: [PATCH 3/4] Intergrate internal FAISS --- ci/jenkins/internalJenkinsfile.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/internalJenkinsfile.groovy b/ci/jenkins/internalJenkinsfile.groovy index cbe9c1dbb1..a0c56ef823 100644 --- a/ci/jenkins/internalJenkinsfile.groovy +++ b/ci/jenkins/internalJenkinsfile.groovy @@ -18,7 +18,7 @@ pipeline { environment { PROJECT_NAME = "milvus" LOWER_BUILD_TYPE = params.BUILD_TYPE.toLowerCase() - SEMVER = BRANCH_NAME.substring(BRANCH_NAME.lastIndexOf("/") + 1) + SEMVER = BRANCH_NAME.contains("/") ? BRANCH_NAME.substring(BRANCH_NAME.lastIndexOf("/") + 1) : "${BRANCH_NAME}" PIPELINE_NAME = env.JOB_NAME.getAt(0..(env.JOB_NAME.indexOf("/") - 1)) } From d66958d87fb96f605ac8d03f5bcc3096b85bd5ef Mon Sep 17 00:00:00 2001 From: quicksilver Date: Thu, 28 Nov 2019 16:10:02 +0800 Subject: [PATCH 4/4] Intergrate internal FAISS --- ci/jenkins/Jenkinsfile | 4 ++-- ci/jenkins/internalJenkinsfile.groovy | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index e86cec2676..b41664b051 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -27,8 +27,8 @@ pipeline { environment { PROJECT_NAME = "milvus" 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.getAt(0..(env.JOB_NAME.indexOf("/") - 1)) + 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}'}" } stages { diff --git a/ci/jenkins/internalJenkinsfile.groovy b/ci/jenkins/internalJenkinsfile.groovy index a0c56ef823..b162a7b241 100644 --- a/ci/jenkins/internalJenkinsfile.groovy +++ b/ci/jenkins/internalJenkinsfile.groovy @@ -18,8 +18,8 @@ pipeline { environment { PROJECT_NAME = "milvus" 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.getAt(0..(env.JOB_NAME.indexOf("/") - 1)) + 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}'}" } stages {