Merge pull request #594 from ZhifengZhang-CN/0.6.0

Intergrate internal FAISS

Merge pull request #594 from ZhifengZhang-CN/0.6.0
Intergrate internal FAISS
c7ab705c · quicksilver · GitHub · 2780da68 · d66958d8 · c7ab705c
隐藏空白更改
内联并排

Showing with 4 addition and 6 deletion

ci/jenkins/Jenkinsfile ci/jenkins/Jenkinsfile +2 -3

ci/jenkins/internalJenkinsfile.groovy ci/jenkins/internalJenkinsfile.groovy +2 -3

未找到文件。
--- 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.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 {

--- 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.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 {