Commit eefcf004 authored by groot's avatar groot
Browse files

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


Former-commit-id: 84ed438d6c29e426bac0fc58c03f8a0cfc9914e4
parents ed2b90c5 9887df67

ci/jenkinsfile/milvus_build.groovy

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ container('milvus-build-env') { 
                            && export FAISS_URL='http://192.168.1.105:6060/jinhai/faiss/-/archive/branch-0.2.1/faiss-branch-0.2.1.tar.gz' \

                            && ./build.sh -t ${params.BUILD_TYPE} -d /opt/milvus -j -u -c"



                            sh "./coverage.sh -u root -p 123456 -t 192.168.1.194"

                            sh "./coverage.sh -u root -p 123456 -t \$POD_IP"

                        }

                    }

                } catch (exc) {

ci/main_jenkinsfile

+13 −0
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ spec: 
  containers:

  - name: milvus-build-env

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

    env:

    - name: POD_IP

      valueFrom:

        fieldRef:

          fieldPath: status.podIP

    command:

    - cat

    tty: true
@@ -56,6 +61,14 @@ spec: 
      requests:

        memory: "14Gi"

        cpu: "5.0"

  - name: milvus-mysql

    image: mysql:5.6

    env:

    - name: MYSQL_ROOT_PASSWORD

      value: 123456

    ports:

    - containerPort: 3306

      name: mysql

"""

                        }

                    }

ci/main_jenkinsfile_no_ut

+13 −0
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ spec: 
  containers:

  - name: milvus-build-env

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

    env:

    - name: POD_IP

      valueFrom:

        fieldRef:

          fieldPath: status.podIP

    command:

    - cat

    tty: true
@@ -56,6 +61,14 @@ spec: 
      requests:

        memory: "14Gi"

        cpu: "5.0"

  - name: milvus-mysql

    image: mysql:5.6

    env:

    - name: MYSQL_ROOT_PASSWORD

      value: 123456

    ports:

    - containerPort: 3306

      name: mysql

"""

                        }

                    }