未验证 提交 aa9c307a 编写于 作者: Z zhuwenxing 提交者: GitHub

[skip e2e]Make work node number can be configured (#17522)

Signed-off-by: Nzhuwenxing <wenxing.zhu@zilliz.com>
上级 e6225d92
...@@ -52,10 +52,25 @@ pipeline { ...@@ -52,10 +52,25 @@ pipeline {
defaultValue: "3.5.0-r1" defaultValue: "3.5.0-r1"
) )
string( string(
description: 'Query Replic Nums', description: 'QueryNode Nums',
name: 'querynode_nums', name: 'querynode_nums',
defaultValue: '3' defaultValue: '3'
) )
string(
description: 'DataNode Nums',
name: 'datanode_nums',
defaultValue: '2'
)
string(
description: 'IndexNode Nums',
name: 'indexnode_nums',
defaultValue: '1'
)
string(
description: 'Proxy Nums',
name: 'proxy_nums',
defaultValue: '1'
)
booleanParam( booleanParam(
description: 'Keep Env', description: 'Keep Env',
name: 'keep_env', name: 'keep_env',
...@@ -88,6 +103,9 @@ pipeline { ...@@ -88,6 +103,9 @@ pipeline {
script { script {
sh """ sh """
yq -i '.queryNode.replicas = "${params.querynode_nums}"' cluster-values.yaml yq -i '.queryNode.replicas = "${params.querynode_nums}"' cluster-values.yaml
yq -i '.dataNode.replicas = "${params.datanode_nums}"' cluster-values.yaml
yq -i '.indexNode.replicas = "${params.indexnode_nums}"' cluster-values.yaml
yq -i '.proxy.replicas = "${params.proxy_nums}"' cluster-values.yaml
yq -i '.etcd.image.repository = "${params.etcd_image_repository}"' cluster-values.yaml yq -i '.etcd.image.repository = "${params.etcd_image_repository}"' cluster-values.yaml
yq -i '.etcd.image.tag = "${params.etcd_image_tag}"' cluster-values.yaml yq -i '.etcd.image.tag = "${params.etcd_image_tag}"' cluster-values.yaml
yq -i '.etcd.image.repository = "${params.etcd_image_repository}"' standalone-values.yaml yq -i '.etcd.image.repository = "${params.etcd_image_repository}"' standalone-values.yaml
......
...@@ -52,10 +52,25 @@ pipeline { ...@@ -52,10 +52,25 @@ pipeline {
defaultValue: "3.5.0-r1" defaultValue: "3.5.0-r1"
) )
string( string(
description: 'Query Replic Nums', description: 'QueryNode Nums',
name: 'querynode_nums', name: 'querynode_nums',
defaultValue: '3' defaultValue: '3'
) )
string(
description: 'DataNode Nums',
name: 'datanode_nums',
defaultValue: '2'
)
string(
description: 'IndexNode Nums',
name: 'indexnode_nums',
defaultValue: '1'
)
string(
description: 'Proxy Nums',
name: 'proxy_nums',
defaultValue: '1'
)
booleanParam( booleanParam(
description: 'Keep Env', description: 'Keep Env',
name: 'keep_env', name: 'keep_env',
...@@ -91,6 +106,9 @@ pipeline { ...@@ -91,6 +106,9 @@ pipeline {
yq -i '.pulsar.enabled = false' cluster-values.yaml yq -i '.pulsar.enabled = false' cluster-values.yaml
yq -i '.queryNode.replicas = "${params.querynode_nums}"' cluster-values.yaml yq -i '.queryNode.replicas = "${params.querynode_nums}"' cluster-values.yaml
yq -i '.dataNode.replicas = "${params.datanode_nums}"' cluster-values.yaml
yq -i '.indexNode.replicas = "${params.indexnode_nums}"' cluster-values.yaml
yq -i '.proxy.replicas = "${params.proxy_nums}"' cluster-values.yaml
yq -i '.etcd.image.repository = "${params.etcd_image_repository}"' cluster-values.yaml yq -i '.etcd.image.repository = "${params.etcd_image_repository}"' cluster-values.yaml
yq -i '.etcd.image.tag = "${params.etcd_image_tag}"' cluster-values.yaml yq -i '.etcd.image.tag = "${params.etcd_image_tag}"' cluster-values.yaml
yq -i '.etcd.image.repository = "${params.etcd_image_repository}"' standalone-values.yaml yq -i '.etcd.image.repository = "${params.etcd_image_repository}"' standalone-values.yaml
......
...@@ -63,6 +63,21 @@ pipeline { ...@@ -63,6 +63,21 @@ pipeline {
name: 'querynode_nums', name: 'querynode_nums',
defaultValue: '3' defaultValue: '3'
) )
string(
description: 'DataNode Nums',
name: 'datanode_nums',
defaultValue: '2'
)
string(
description: 'IndexNode Nums',
name: 'indexnode_nums',
defaultValue: '1'
)
string(
description: 'Proxy Nums',
name: 'proxy_nums',
defaultValue: '1'
)
string( string(
description: 'Data Size', description: 'Data Size',
name: 'data_size', name: 'data_size',
...@@ -106,6 +121,9 @@ pipeline { ...@@ -106,6 +121,9 @@ pipeline {
script { script {
sh """ sh """
yq -i '.queryNode.replicas = "${params.querynode_nums}"' cluster-values.yaml yq -i '.queryNode.replicas = "${params.querynode_nums}"' cluster-values.yaml
yq -i '.dataNode.replicas = "${params.datanode_nums}"' cluster-values.yaml
yq -i '.indexNode.replicas = "${params.indexnode_nums}"' cluster-values.yaml
yq -i '.proxy.replicas = "${params.proxy_nums}"' cluster-values.yaml
yq -i '.etcd.image.repository = "${params.etcd_image_repository}"' cluster-values.yaml yq -i '.etcd.image.repository = "${params.etcd_image_repository}"' cluster-values.yaml
yq -i '.etcd.image.tag = "${params.etcd_image_tag}"' cluster-values.yaml yq -i '.etcd.image.tag = "${params.etcd_image_tag}"' cluster-values.yaml
yq -i '.etcd.image.repository = "${params.etcd_image_repository}"' standalone-values.yaml yq -i '.etcd.image.repository = "${params.etcd_image_repository}"' standalone-values.yaml
......
...@@ -62,7 +62,22 @@ pipeline { ...@@ -62,7 +62,22 @@ pipeline {
description: 'Querynode Nums', description: 'Querynode Nums',
name: 'querynode_nums', name: 'querynode_nums',
defaultValue: '3' defaultValue: '3'
) )
string(
description: 'DataNode Nums',
name: 'datanode_nums',
defaultValue: '2'
)
string(
description: 'IndexNode Nums',
name: 'indexnode_nums',
defaultValue: '1'
)
string(
description: 'Proxy Nums',
name: 'proxy_nums',
defaultValue: '1'
)
string( string(
description: 'Data Size', description: 'Data Size',
name: 'data_size', name: 'data_size',
...@@ -113,6 +128,12 @@ pipeline { ...@@ -113,6 +128,12 @@ pipeline {
} else if ("${params.mq_type}" == "kafka") { } else if ("${params.mq_type}" == "kafka") {
sh "yq -i '.kafka.enabled = true' cluster-values.yaml" sh "yq -i '.kafka.enabled = true' cluster-values.yaml"
} }
sh"""
yq -i '.queryNode.replicas = "${params.querynode_nums}"' cluster-values.yaml
yq -i '.dataNode.replicas = "${params.datanode_nums}"' cluster-values.yaml
yq -i '.indexNode.replicas = "${params.indexnode_nums}"' cluster-values.yaml
yq -i '.proxy.replicas = "${params.proxy_nums}"' cluster-values.yaml
"""
sh "cat cluster-values.yaml" sh "cat cluster-values.yaml"
} }
} }
......
...@@ -3,14 +3,10 @@ set -e ...@@ -3,14 +3,10 @@ set -e
release=${1:-"milvs-chaos"} release=${1:-"milvs-chaos"}
ns=${2:-"chaos-testing"} ns=${2:-"chaos-testing"}
pod=${3:-"querynode"}
node_num=${4:-1}
bash uninstall_milvus.sh ${release} ${ns}|| true bash uninstall_milvus.sh ${release} ${ns}|| true
declare -A pod_map=(["querynode"]="queryNode" ["indexnode"]="indexNode" ["datanode"]="dataNode" ["proxy"]="proxy")
echo "insatll cluster" echo "insatll cluster"
helm install --wait --debug --timeout 600s ${RELEASE_NAME:-$release} milvus/milvus \ helm install --wait --debug --timeout 600s ${RELEASE_NAME:-$release} milvus/milvus \
--set image.all.repository=${REPOSITORY:-"milvusdb/milvus-dev"} \ --set image.all.repository=${REPOSITORY:-"milvusdb/milvus-dev"} \
--set image.all.tag=${IMAGE_TAG:-"master-latest"} \ --set image.all.tag=${IMAGE_TAG:-"master-latest"} \
--set ${pod_map[${pod}]}.replicas=$node_num \
-f ../cluster-values.yaml -n=${ns} -f ../cluster-values.yaml -n=${ns}
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册