Use charts version instead of chart repo for helm install (#15300)

Signed-off-by: Jenny Li <jing.li@zilliz.com>
pull/15302/head
Jenny Li 2022-01-19 19:45:36 +08:00 committed by GitHub
parent c4d4702210
commit 524d4126d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 6 deletions

View File

@ -7,7 +7,7 @@ String cron_string = BRANCH_NAME == "master" ? "50 22 * * * " : ""
int total_timeout_minutes = 660
def imageTag=''
def chart_version='2.4.25'
pipeline {
triggers {
cron """${cron_timezone}
@ -134,6 +134,7 @@ pipeline {
--set etcd.metrics.enabled=true \
--set etcd.metrics.podMonitor.enabled=true \
--set etcd.nodeSelector.disk=fast \
--version ${chart_version} \
--set metrics.serviceMonitor.enabled=true"
"""
}

View File

@ -4,6 +4,7 @@ int total_timeout_minutes = 120
int e2e_timeout_seconds = 70 * 60
def imageTag=''
int case_timeout_seconds = 10 * 60
def chart_version='2.4.25'
pipeline {
options {
timestamps()
@ -127,6 +128,7 @@ pipeline {
--set etcd.metrics.podMonitor.enabled=true \
--set etcd.nodeSelector.disk=fast \
--set metrics.serviceMonitor.enabled=true \
--version ${chart_version} \
-f values/pr.yaml"
"""
}

View File

@ -55,11 +55,16 @@ if [[ -n "${DISABLE_KIND:-}" ]]; then
fi
# Get Milvus Chart from git
if [[ ! -d "${MILVUS_HELM_CHART_PATH:-}" ]]; then
TMP_DIR="$(mktemp -d)"
git clone --depth=1 -b "${MILVUS_HELM_BRANCH:-master}" "${MILVUS_HELM_REPO}" "${TMP_DIR}"
MILVUS_HELM_CHART_PATH="${TMP_DIR}/charts/milvus"
fi
# if [[ ! -d "${MILVUS_HELM_CHART_PATH:-}" ]]; then
# TMP_DIR="$(mktemp -d)"
# git clone --depth=1 -b "${MILVUS_HELM_BRANCH:-master}" "${MILVUS_HELM_REPO}" "${TMP_DIR}"
# MILVUS_HELM_CHART_PATH="${TMP_DIR}/charts/milvus"
# fi
# Use helm repo to install milvus charts
helm repo add milvus https://milvus-io.github.io/milvus-helm/
helm repo update
MILVUS_HELM_CHART_PATH="milvus/milvus"
# Create namespace when it does not exist
kubectl create namespace "${MILVUS_HELM_NAMESPACE}" > /dev/null 2>&1 || true