From 35e3371556928f978030d49bbb739480a6ddd5b9 Mon Sep 17 00:00:00 2001 From: Jenny Li Date: Thu, 6 Jan 2022 14:27:20 +0800 Subject: [PATCH] [skip e2e] Add CI-Mode to separate nightly & pr (#14718) Signed-off-by: Jenny Li --- build/ci/jenkins/Nightly.groovy | 1 + build/ci/jenkins/PR.groovy | 1 + tests/scripts/get_release_name.sh | 12 +++++++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/build/ci/jenkins/Nightly.groovy b/build/ci/jenkins/Nightly.groovy index aa143188b0..7c14ff5f81 100644 --- a/build/ci/jenkins/Nightly.groovy +++ b/build/ci/jenkins/Nightly.groovy @@ -43,6 +43,7 @@ pipeline { DISABLE_KIND = true HUB = "registry.milvus.io/milvus" JENKINS_BUILD_ID = "${env.BUILD_ID}" + CI_MODE="nightly" } stages { diff --git a/build/ci/jenkins/PR.groovy b/build/ci/jenkins/PR.groovy index f1d1ea4bbb..18a55b3cfc 100644 --- a/build/ci/jenkins/PR.groovy +++ b/build/ci/jenkins/PR.groovy @@ -34,6 +34,7 @@ pipeline { DISABLE_KIND = true HUB = 'registry.milvus.io/milvus' JENKINS_BUILD_ID = "${env.BUILD_ID}" + CI_MODE="pr" } stages { diff --git a/tests/scripts/get_release_name.sh b/tests/scripts/get_release_name.sh index 6a01f9a93f..2aec794ad6 100755 --- a/tests/scripts/get_release_name.sh +++ b/tests/scripts/get_release_name.sh @@ -36,12 +36,22 @@ function milvus_ci_release_name(){ name+="-${CHANGE_ID:-}" fi - + # Add Jenkins BUILD_ID into Name if [[ -n ${JENKINS_BUILD_ID:-} ]]; then name+="-${JENKINS_BUILD_ID}" fi + + if [[ "${CI_MODE:-}" == "nightly" ]]; then + # Nightly CI + name+="-n" + else + # Pull Request CI + name+="-pr" + + fi + export MILVUS_HELM_RELEASE_NAME=${name} echo ${name} }