From d5c2b6bde9bb8de7f1c86a3e61bcacf3b4868eef Mon Sep 17 00:00:00 2001 From: Jenny Li Date: Wed, 29 Dec 2021 11:52:48 +0800 Subject: [PATCH] Remove timeout for nightly build (#14475) Signed-off-by: Jenny Li --- build/ci/jenkins/PR.groovy | 3 +-- tests/scripts/ci_e2e.sh | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build/ci/jenkins/PR.groovy b/build/ci/jenkins/PR.groovy index c5af8826c5..4877ac9796 100644 --- a/build/ci/jenkins/PR.groovy +++ b/build/ci/jenkins/PR.groovy @@ -151,8 +151,7 @@ pipeline { MILVUS_HELM_RELEASE_NAME="${release_name}" \ MILVUS_CLUSTER_ENABLED="${clusterEnabled}" \ TEST_TIMEOUT="${e2e_timeout_seconds}" \ - CASE_TIMEOUT="${case_timeout_seconds}"\ - ./ci_e2e.sh "-n 6 -x --tags L0 L1" + ./ci_e2e.sh "-n 6 -x --tags L0 L1 --timeout ${case_timeout_seconds}" """ } else { error "Error: Unsupported Milvus client: ${MILVUS_CLIENT}" diff --git a/tests/scripts/ci_e2e.sh b/tests/scripts/ci_e2e.sh index 8739fd1c7a..58171bb3f5 100755 --- a/tests/scripts/ci_e2e.sh +++ b/tests/scripts/ci_e2e.sh @@ -62,12 +62,12 @@ if [ ! -d "${CI_LOG_PATH}" ]; then fi trace "prepare e2e test" install_pytest_requirements -CASE_TIMEOUT=${CASE_TIMEOUT:-600} + if [[ -n "${TEST_TIMEOUT:-}" ]]; then timeout "${TEST_TIMEOUT}" pytest --host ${MILVUS_SERVICE_NAME} --port ${MILVUS_SERVICE_PORT} \ - --timeout ${CASE_TIMEOUT} --html=${CI_LOG_PATH}/report.html --self-contained-html ${@:-} + --html=${CI_LOG_PATH}/report.html --self-contained-html ${@:-} else pytest --host ${MILVUS_SERVICE_NAME} --port ${MILVUS_SERVICE_PORT} \ - --timeout ${CASE_TIMEOUT} --html=${CI_LOG_PATH}/report.html --self-contained-html ${@:-} + --html=${CI_LOG_PATH}/report.html --self-contained-html ${@:-} fi \ No newline at end of file