Commit 761d0e12 authored by 王翔宇's avatar 王翔宇
Browse files

solve conflicts 


Former-commit-id: 1da4ba36dae48610b5cd32e0eef66b1356840c45
parents 3b107731 e532bd39

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"

                        }

                    }

ci/jenkinsfile/milvus_build_no_ut.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"

                        }

                    }

ci/main_jenkinsfile

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ metadata: 
spec:

  containers:

  - name: milvus-build-env

    image: registry.zilliz.com/milvus/milvus-build-env:v0.12

    image: registry.zilliz.com/milvus/milvus-build-env:v0.13

    command:

    - cat

    tty: true

ci/main_jenkinsfile_no_ut

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ metadata: 
spec:

  containers:

  - name: milvus-build-env

    image: registry.zilliz.com/milvus/milvus-build-env:v0.12

    image: registry.zilliz.com/milvus/milvus-build-env:v0.13

    command:

    - cat

    tty: true

ci/nightly_main_jenkinsfile

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ metadata: 
spec:

  containers:

  - name: milvus-build-env

    image: registry.zilliz.com/milvus/milvus-build-env:v0.12

    image: registry.zilliz.com/milvus/milvus-build-env:v0.13

    command:

    - cat

    tty: true