Unverified Commit 7fd932d1 authored by del-zhenwu's avatar del-zhenwu Committed by GitHub
Browse files

update shards deploy method on 0.9.1 (#2430) 



* update shards deploy method

Signed-off-by: default avatarzw <zw@milvus.io>

* update run level

Signed-off-by: default avatarzw <zw@milvus.io>

Co-authored-by: default avatarzw <zw@milvus.io>
parent 14d1ad51

ci/jenkins/step/shardsDevNightlyTest.groovy

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ timeout(time: 180, unit: 'MINUTES') { 
        checkout([$class: 'GitSCM', branches: [[name: "nightly"]], userRemoteConfigs: [[url: "https://github.com/milvus-io/milvus-helm.git", name: 'origin', refspec: "+refs/heads/nightly:refs/remotes/origin/nightly"]]])

        retry(3) {

            try {

                sh "helm install --wait --timeout 300s --set mishards.enabled=true --set persistence.enabled=true --set image.repository=registry.zilliz.com/milvus/engine --set mishards.image.tag=0.9.0-rc --set image.tag=${DOCKER_VERSION} --set image.pullPolicy=Always --set service.type=ClusterIP -f ci/db_backend/mysql_${BINARY_VERSION}_values.yaml --namespace milvus ${env.SHARDS_HELM_RELEASE_NAME} ."

                sh "helm install --wait --timeout 300s --set cluster.enabled=true --set persistence.enabled=true --set image.repository=registry.zilliz.com/milvus/engine --set mishards.image.tag=test --set image.tag=${DOCKER_VERSION} --set image.pullPolicy=Always --set service.type=ClusterIP -f ci/db_backend/mysql_${BINARY_VERSION}_values.yaml --namespace milvus ${env.SHARDS_HELM_RELEASE_NAME} ."

            } catch (exc) {

                def helmStatusCMD = "helm get manifest --namespace milvus ${env.SHARDS_HELM_RELEASE_NAME} | kubectl describe -n milvus -f - && \

                                     kubectl logs --namespace milvus -l \"app=milvus,release=${env.SHARDS_HELM_RELEASE_NAME}\" -c milvus && \
@@ -22,6 +22,6 @@ timeout(time: 180, unit: 'MINUTES') { 
    

    dir ("tests/milvus_python_test") {

        sh 'python3 -m pip install -r requirements.txt'

        sh "pytest . --alluredir=\"test_out/dev/shards/\" --ip ${env.SHARDS_HELM_RELEASE_NAME}-milvus-mishards.milvus.svc.cluster.local"

        sh "pytest . --level=2 --alluredir=\"test_out/dev/shards/\" --ip ${env.SHARDS_HELM_RELEASE_NAME}.milvus.svc.cluster.local"

    }

}

ci/jenkins/step/singleDevNightlyTest.groovy

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ timeout(time: 180, unit: 'MINUTES') { 
    dir ("tests/milvus_python_test") {

        // sh 'python3 -m pip install -r requirements.txt -i http://pypi.douban.com/simple --trusted-host pypi.douban.com'

        sh 'python3 -m pip install -r requirements.txt'

        sh "pytest . --alluredir=\"test_out/dev/single/mysql\" --ip ${env.HELM_RELEASE_NAME}.milvus.svc.cluster.local"

        sh "pytest . --level=2 --alluredir=\"test_out/dev/single/mysql\" --ip ${env.HELM_RELEASE_NAME}.milvus.svc.cluster.local"

    }

    // sqlite database backend test

    load "ci/jenkins/step/cleanupSingleDev.groovy"
@@ -50,6 +50,6 @@ timeout(time: 180, unit: 'MINUTES') { 
        }

    }

    dir ("tests/milvus_python_test") {

        sh "pytest . --alluredir=\"test_out/dev/single/sqlite\" --ip ${env.HELM_RELEASE_NAME}.milvus.svc.cluster.local"

        sh "pytest . --level=2 --alluredir=\"test_out/dev/single/sqlite\" --ip ${env.HELM_RELEASE_NAME}.milvus.svc.cluster.local"

    }

}

tests/milvus_python_test/test_partition.py

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class TestCreateBase: 
        status = connect.create_partition(collection, tag)

        assert status.OK()



    @pytest.mark.level(2)

    @pytest.mark.level(3)

    @pytest.mark.timeout(TIMEOUT)

    def test_create_partition_limit(self, connect, collection):

        '''