From f709d346743dca0146fa47f4a03a2bc466bf9344 Mon Sep 17 00:00:00 2001 From: del-zhenwu <56623710+del-zhenwu@users.noreply.github.com> Date: Thu, 28 May 2020 00:34:28 +0800 Subject: [PATCH] try connect set false (#2443) * update shards deploy method Signed-off-by: zw * update run level Signed-off-by: zw * try connect set false Signed-off-by: zw * update shards deploy branch Signed-off-by: zw Co-authored-by: zw --- ci/jenkins/step/shardsDevNightlyTest.groovy | 4 ++-- tests/milvus_python_test/entity/test_insert.py | 6 +++--- tests/milvus_python_test/utils.py | 7 ++++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ci/jenkins/step/shardsDevNightlyTest.groovy b/ci/jenkins/step/shardsDevNightlyTest.groovy index abefe1e7..49e92993 100644 --- a/ci/jenkins/step/shardsDevNightlyTest.groovy +++ b/ci/jenkins/step/shardsDevNightlyTest.groovy @@ -3,8 +3,8 @@ timeout(time: 180, unit: 'MINUTES') { sh 'helm version' sh 'helm repo add stable https://kubernetes.oss-cn-hangzhou.aliyuncs.com/charts' sh 'helm repo update' - 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"]]]) - sh 'helm dep update' + checkout([$class: 'GitSCM', branches: [[name: "${env.HELM_BRANCH}"]], userRemoteConfigs: [[url: "https://github.com/milvus-io/milvus-helm.git", name: 'origin', refspec: "+refs/heads/${env.HELM_BRANCH}:refs/remotes/origin/${env.HELM_BRANCH}"]]]) + retry(3) { try { 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} ." diff --git a/tests/milvus_python_test/entity/test_insert.py b/tests/milvus_python_test/entity/test_insert.py index e0da4b0a..3bfff249 100644 --- a/tests/milvus_python_test/entity/test_insert.py +++ b/tests/milvus_python_test/entity/test_insert.py @@ -594,12 +594,12 @@ class TestAddBase: pytest.skip("Skip test in http mode") thread_num = 8 threads = [] - milvus = get_milvus(host=args["ip"], port=args["port"], handler=args["handler"]) + milvus = get_milvus(host=args["ip"], port=args["port"], handler=args["handler"], try_connect=False) vectors = gen_vectors(nb, dim) def add(thread_i): logging.getLogger().info("In thread-%d" % thread_i) - milvus = get_milvus(host=args["ip"], port=args["port"], handler=args["handler"]) - assert milvus + # milvus = get_milvus(host=args["ip"], port=args["port"], handler=args["handler"]) + # assert milvus status, result = milvus.insert(collection, records=vectors) assert status.OK() status = milvus.flush([collection]) diff --git a/tests/milvus_python_test/utils.py b/tests/milvus_python_test/utils.py index 77a24084..eb6c3411 100644 --- a/tests/milvus_python_test/utils.py +++ b/tests/milvus_python_test/utils.py @@ -24,13 +24,14 @@ all_index_types = [ ] -def get_milvus(host, port, uri=None, handler=None): +def get_milvus(host, port, uri=None, handler=None, **kwargs): if handler is None: handler = "GRPC" + try_connect = kwargs.get("try_connect", True) if uri is not None: - milvus = Milvus(uri=uri, handler=handler) + milvus = Milvus(uri=uri, handler=handler, try_connect=try_connect) else: - milvus = Milvus(host=host, port=port, handler=handler) + milvus = Milvus(host=host, port=port, handler=handler, try_connect=try_connect) return milvus -- GitLab