admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-08 01:58:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[skip ci] PR uses milvus-helm 2.1.22 to install milvus (#9063)

Browse Source 
Signed-off-by: Edward Zeng <jie.zeng@zilliz.com>
This commit is contained in:
edward.zeng 2021-10-02 11:53:54 +08:00 committed by GitHub
parent 234fd9b512
commit a170da5e46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/ci/jenkins/Jenkinsfile vendored
View File

@ -63,6 +63,7 @@ pipeline {
if ("${MILVUS_CLIENT}" == "pymilvus") { if ("${MILVUS_CLIENT}" == "pymilvus") {
sh """ sh """
MILVUS_CLUSTER_ENABLED=${clusterEnabled} \ MILVUS_CLUSTER_ENABLED=${clusterEnabled} \
MILVUS_PR_CI=true \
./e2e-k8s.sh \ ./e2e-k8s.sh \
--node-image registry.zilliz.com/kindest/node:v1.20.2 \ --node-image registry.zilliz.com/kindest/node:v1.20.2 \
--kind-config "${env.WORKSPACE}/build/config/topology/trustworthy-jwt-ci.yaml" \ --kind-config "${env.WORKSPACE}/build/config/topology/trustworthy-jwt-ci.yaml" \

48
tests/scripts/install_milvus.sh
View File

@ -42,13 +42,19 @@ fi
if [[ ! -d "${MILVUS_HELM_CHART_PATH:-}" ]]; then if [[ ! -d "${MILVUS_HELM_CHART_PATH:-}" ]]; then
TMP_DIR="$(mktemp -d)" TMP_DIR="$(mktemp -d)"
git clone --depth=1 -b "${MILVUS_HELM_BRANCH:-master}" "${MILVUS_HELM_REPO}" "${TMP_DIR}" if [[ "${MILVUS_PR_CI}" == "true" ]]; then
# pr ci only use milvus-helm version: 2.1.22
git clone -b "${MILVUS_HELM_BRANCH:-master}" "${MILVUS_HELM_REPO}" "${TMP_DIR}"
cd "${TMP_DIR}" && git checkout -b milvus-2.1.22 milvus-2.1.22 && cd -
else
git clone --depth=1 -b "${MILVUS_HELM_BRANCH:-master}" "${MILVUS_HELM_REPO}" "${TMP_DIR}"
fi
MILVUS_HELM_CHART_PATH="${TMP_DIR}/charts/milvus" MILVUS_HELM_CHART_PATH="${TMP_DIR}/charts/milvus"
fi fi
kubectl create namespace "${MILVUS_HELM_NAMESPACE}" > /dev/null 2>&1 || true kubectl create namespace "${MILVUS_HELM_NAMESPACE}" > /dev/null 2>&1 || true
if [[ "${MILVUS_CLUSTER_ENABLED}" == "true" ]]; then if [[ "${MILVUS_PR_CI}" == "true" ]]; then
helm install --wait --timeout "${MILVUS_INSTALL_TIMEOUT}" \ helm install --wait --timeout "${MILVUS_INSTALL_TIMEOUT}" \
--set image.all.repository="${MILVUS_IMAGE_REPO}" \ --set image.all.repository="${MILVUS_IMAGE_REPO}" \
--set image.all.tag="${MILVUS_IMAGE_TAG}" \ --set image.all.tag="${MILVUS_IMAGE_TAG}" \
@ -58,17 +64,31 @@ if [[ "${MILVUS_CLUSTER_ENABLED}" == "true" ]]; then
--namespace "${MILVUS_HELM_NAMESPACE}" \ --namespace "${MILVUS_HELM_NAMESPACE}" \
"${MILVUS_HELM_RELEASE_NAME}" \ "${MILVUS_HELM_RELEASE_NAME}" \
${@:-} "${MILVUS_HELM_CHART_PATH}" ${@:-} "${MILVUS_HELM_CHART_PATH}"
else else
helm install --wait --timeout "${MILVUS_INSTALL_TIMEOUT}" \ if [[ "${MILVUS_CLUSTER_ENABLED}" == "true" ]]; then
--set image.all.repository="${MILVUS_IMAGE_REPO}" \ helm install --wait --timeout "${MILVUS_INSTALL_TIMEOUT}" \
--set image.all.tag="${MILVUS_IMAGE_TAG}" \ --set image.all.repository="${MILVUS_IMAGE_REPO}" \
--set image.all.pullPolicy="${MILVUS_PULL_POLICY:-Always}" \ --set image.all.tag="${MILVUS_IMAGE_TAG}" \
--set cluster.enabled="${MILVUS_CLUSTER_ENABLED}" \ --set image.all.pullPolicy="${MILVUS_PULL_POLICY:-Always}" \
--set pulsar.enabled=false \ --set cluster.enabled="${MILVUS_CLUSTER_ENABLED}" \
--set minio.mode=standalone \ --set service.type="${MILVUS_SERVICE_TYPE}" \
--set etcd.replicaCount=1 \ --namespace "${MILVUS_HELM_NAMESPACE}" \
--set service.type="${MILVUS_SERVICE_TYPE}" \ "${MILVUS_HELM_RELEASE_NAME}" \
--namespace "${MILVUS_HELM_NAMESPACE}" \ ${@:-} "${MILVUS_HELM_CHART_PATH}"
"${MILVUS_HELM_RELEASE_NAME}" \ else
${@:-} "${MILVUS_HELM_CHART_PATH}" 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 cluster.enabled="${MILVUS_CLUSTER_ENABLED}" \
--set pulsar.enabled=false \
--set minio.mode=standalone \
--set etcd.replicaCount=1 \
--set service.type="${MILVUS_SERVICE_TYPE}" \
--namespace "${MILVUS_HELM_NAMESPACE}" \
"${MILVUS_HELM_RELEASE_NAME}" \
${@:-} "${MILVUS_HELM_CHART_PATH}"
fi
fi fi