From 2b2ec0889c5cc93476c357a7b65c7e557cbc8257 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Thu, 17 Jun 2021 21:13:59 +0800 Subject: [PATCH] [skip ci] Unified milvus access layer in e2e test (#5847) Signed-off-by: quicksilver --- tests/scripts/install_milvus.sh | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/tests/scripts/install_milvus.sh b/tests/scripts/install_milvus.sh index d97ab2bbf5..c675279603 100755 --- a/tests/scripts/install_milvus.sh +++ b/tests/scripts/install_milvus.sh @@ -46,24 +46,12 @@ fi kubectl create namespace "${MILVUS_HELM_NAMESPACE}" || true -if [[ "${MILVUS_STANDALONE_ENABLED}" == "false" ]]; then - helm install --wait --timeout "${MILVUS_INSTALL_TIMEOUT}" \ - --set image.all.repository="${MILVUS_IMAGE_REPO}" \ - --set image.all.tag="${MILVUS_IMAGE_TAG}" \ - --set image.all.pullPolicy="${MILVUS_PULL_POLICY:-Always}" \ - --set standalone.enabled="${MILVUS_STANDALONE_ENABLED}" \ - --set proxy.service.type="${MILVUS_SERVICE_TYPE}" \ - --namespace "${MILVUS_HELM_NAMESPACE}" \ - "${MILVUS_HELM_RELEASE_NAME}" \ - ${@:-} "${MILVUS_HELM_CHART_PATH}" -else - helm install --wait --timeout "${MILVUS_INSTALL_TIMEOUT}" \ - --set image.all.repository="${MILVUS_IMAGE_REPO}" \ - --set image.all.tag="${MILVUS_IMAGE_TAG}" \ - --set image.all.pullPolicy="${MILVUS_PULL_POLICY:-Always}" \ - --set standalone.enabled="${MILVUS_STANDALONE_ENABLED}" \ - --set standalone.service.type="${MILVUS_SERVICE_TYPE}" \ - --namespace "${MILVUS_HELM_NAMESPACE}" \ - "${MILVUS_HELM_RELEASE_NAME}" \ - ${@:-} "${MILVUS_HELM_CHART_PATH}" -fi +helm install --wait --timeout "${MILVUS_INSTALL_TIMEOUT}" \ + --set image.all.repository="${MILVUS_IMAGE_REPO}" \ + --set image.all.tag="${MILVUS_IMAGE_TAG}" \ + --set image.all.pullPolicy="${MILVUS_PULL_POLICY:-Always}" \ + --set standalone.enabled="${MILVUS_STANDALONE_ENABLED}" \ + --set service.type="${MILVUS_SERVICE_TYPE}" \ + --namespace "${MILVUS_HELM_NAMESPACE}" \ + "${MILVUS_HELM_RELEASE_NAME}" \ + ${@:-} "${MILVUS_HELM_CHART_PATH}"