milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set milvus cluster deployment default to false (#5910) 

Signed-off-by: quicksilver <zhifeng.zhang@zilliz.com>
pull/5914/head
quicksilver 2021-06-21 12:00:06 +08:00 committed by GitHub
parent d0d0260b4c
commit b2939e5cd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/ci/jenkins/Jenkinsfile vendored
View File

@ -35,7 +35,6 @@ pipeline {
IMAGE_REPO = "dockerhub-mirror-sh.zilliz.cc/milvusdb"
DOCKER_BUILDKIT = 1
ARTIFACTS = "${env.WORKSPACE}/artifacts"
MILVUS_HELM_BRANCH = "rename"
}
stages {
stage('Test') {
@ -43,13 +42,13 @@ pipeline {
container('main') {
dir ('tests/scripts') {
script {
def standaloneEnabled = "true"
def clusterEnabled = "false"
if ("${MILVUS_SERVER_TYPE}" == "distributed") {
standaloneEnabled = "false"
clusterEnabled = "true"
}
sh """
MILVUS_STANDALONE_ENABLED=${standaloneEnabled} \
MILVUS_CLUSTER_ENABLED=${clusterEnabled} \
./e2e-k8s.sh \
--node-image registry.zilliz.com/kindest/node:v1.20.2 \
--test-extra-arg "--tags=smoke"

7
build/ci/jenkins/NightlyCI.groovy
View File

@ -44,7 +44,6 @@ pipeline {
DOCKER_CREDENTIALS_ID = "ba070c98-c8cc-4f7c-b657-897715f359fc"
DOKCER_REGISTRY_URL = "registry.zilliz.com"
TARGET_REPO = "${DOKCER_REGISTRY_URL}/milvus"
MILVUS_HELM_BRANCH = "rename"
}
stages {
stage('Test') {
@ -52,13 +51,13 @@ pipeline {
container('main') {
dir ('tests/scripts') {
script {
def standaloneEnabled = "true"
def clusterEnabled = "false"
if ("${MILVUS_SERVER_TYPE}" == "distributed") {
standaloneEnabled = "false"
clusterEnabled = "true"
}
sh """
MILVUS_STANDALONE_ENABLED=${standaloneEnabled} \
MILVUS_CLUSTER_ENABLED=${clusterEnabled} \
./e2e-k8s.sh \
--node-image registry.zilliz.com/kindest/node:v1.20.2
"""

4
tests/scripts/e2e.sh
View File

@ -15,7 +15,7 @@ set -e
set -x
MILVUS_HELM_RELEASE_NAME="${MILVUS_HELM_RELEASE_NAME:-milvus-testing}"
MILVUS_STANDALONE_ENABLED="${MILVUS_STANDALONE_ENABLED:-true}"
MILVUS_CLUSTER_ENABLED="${MILVUS_CLUSTER_ENABLED:-false}"
MILVUS_HELM_NAMESPACE="${MILVUS_HELM_NAMESPACE:-default}"
PARALLEL_NUM="${PARALLEL_NUM:-4}"
@ -28,7 +28,7 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
done
ROOT="$( cd -P "$( dirname "$SOURCE" )/../.." && pwd )"
if [[ "${MILVUS_STANDALONE_ENABLED}" == "true" ]]; then
if [[ "${MILVUS_CLUSTER_ENABLED}" == "false" ]]; then
MILVUS_LABELS="app.kubernetes.io/instance=${MILVUS_HELM_RELEASE_NAME},component=standalone"
else
MILVUS_LABELS="app.kubernetes.io/instance=${MILVUS_HELM_RELEASE_NAME},component=proxy"

4
tests/scripts/install_milvus.sh
View File

@ -16,7 +16,7 @@ set -x
MILVUS_HELM_REPO="https://github.com/zilliztech/milvus-helm-charts.git"
MILVUS_HELM_RELEASE_NAME="${MILVUS_HELM_RELEASE_NAME:-milvus-testing}"
MILVUS_STANDALONE_ENABLED="${MILVUS_STANDALONE_ENABLED:-true}"
MILVUS_CLUSTER_ENABLED="${MILVUS_CLUSTER_ENABLED:-false}"
MILVUS_IMAGE_REPO="${MILVUS_IMAGE_REPO:-milvusdb/milvus}"
MILVUS_IMAGE_TAG="${MILVUS_IMAGE_TAG:-latest}"
MILVUS_HELM_NAMESPACE="${MILVUS_HELM_NAMESPACE:-default}"
@ -50,7 +50,7 @@ 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 standalone.enabled="${MILVUS_STANDALONE_ENABLED}" \
--set cluster.enabled="${MILVUS_CLUSTER_ENABLED}" \
--set service.type="${MILVUS_SERVICE_TYPE}" \
--namespace "${MILVUS_HELM_NAMESPACE}" \
"${MILVUS_HELM_RELEASE_NAME}" \