From 106387fb0368df1de83d8127367e3ce643fa59c0 Mon Sep 17 00:00:00 2001 From: Jenny Li Date: Fri, 31 Dec 2021 14:14:17 +0800 Subject: [PATCH] Change hardcode to parameter (#14645) Signed-off-by: Jenny Li --- build/ci/jenkins/Nightly.groovy | 1 + build/ci/jenkins/PR.groovy | 1 + tests/scripts/ci_e2e.sh | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build/ci/jenkins/Nightly.groovy b/build/ci/jenkins/Nightly.groovy index 908b876be0..aa143188b0 100644 --- a/build/ci/jenkins/Nightly.groovy +++ b/build/ci/jenkins/Nightly.groovy @@ -159,6 +159,7 @@ pipeline { if ("${MILVUS_CLIENT}" == "pymilvus") { sh """ MILVUS_HELM_RELEASE_NAME="${release_name}" \ + MILVUS_HELM_NAMESPACE="milvus-ci" \ MILVUS_CLUSTER_ENABLED="${clusterEnabled}" \ TEST_TIMEOUT="${e2e_timeout_seconds}" \ ./ci_e2e.sh "--workers 4 --tags L0 L1 L2 --repeat-scope=session --random-order-bucket=global" diff --git a/build/ci/jenkins/PR.groovy b/build/ci/jenkins/PR.groovy index 4877ac9796..fb84ec7c38 100644 --- a/build/ci/jenkins/PR.groovy +++ b/build/ci/jenkins/PR.groovy @@ -149,6 +149,7 @@ pipeline { if ("${MILVUS_CLIENT}" == "pymilvus") { sh """ MILVUS_HELM_RELEASE_NAME="${release_name}" \ + MILVUS_HELM_NAMESPACE="milvus-ci" \ MILVUS_CLUSTER_ENABLED="${clusterEnabled}" \ TEST_TIMEOUT="${e2e_timeout_seconds}" \ ./ci_e2e.sh "-n 6 -x --tags L0 L1 --timeout ${case_timeout_seconds}" diff --git a/tests/scripts/ci_e2e.sh b/tests/scripts/ci_e2e.sh index 029e06f883..93627c3314 100755 --- a/tests/scripts/ci_e2e.sh +++ b/tests/scripts/ci_e2e.sh @@ -37,7 +37,7 @@ MILVUS_HELM_NAMESPACE="${MILVUS_HELM_NAMESPACE:-default}" PARALLEL_NUM="${PARALLEL_NUM:-6}" MILVUS_CLIENT="${MILVUS_CLIENT:-pymilvus}" # Use service name instead of IP to test -MILVUS_SERVICE_NAME=$(echo "${MILVUS_HELM_RELEASE_NAME}-milvus.milvus-ci" | tr -d '\n') +MILVUS_SERVICE_NAME=$(echo "${MILVUS_HELM_RELEASE_NAME}-milvus.${MILVUS_HELM_NAMESPACE}" | tr -d '\n') MILVUS_SERVICE_PORT="19530" # Shellcheck source=build/lib.sh