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

[skip e2e]Update config for deploy and chaos test (#17333)

Signed-off-by: Nzhuwenxing <wenxing.zhu@zilliz.com>
上级 7a59a805
......@@ -44,23 +44,18 @@ pipeline {
string(
description: 'Etcd Image Repository',
name: 'etcd_image_repository',
defaultValue: "milvusdb/etcd"
defaultValue: "bitnami/etcd"
)
string(
description: 'Etcd Image Tag',
name: 'etcd_image_tag',
defaultValue: "3.5.0-debian-10-r117"
defaultValue: "3.5.0-debian-10-r24"
)
string(
description: 'Query Replic Nums',
name: 'querynode_replica_nums',
name: 'querynode_nums',
defaultValue: '3'
)
string(
description: 'Pod Nums',
name: 'pod_nums',
defaultValue: '1'
)
booleanParam(
description: 'Keep Env',
name: 'keep_env',
......@@ -92,12 +87,11 @@ pipeline {
dir ('tests/python_client/chaos') {
script {
sh """
yq -i '.queryNode.replicas = "${params.querynode_replica_nums}"' cluster-values.yaml
yq -i '.queryNode.replicas = "${params.querynode_nums}"' 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.repository = "${params.etcd_image_repository}"' standalone-values.yaml
yq -i '.etcd.image.tag = "${params.etcd_image_tag}"' standalone-values.yaml
cat cluster-values.yaml
"""
}
}
......@@ -106,7 +100,7 @@ pipeline {
}
stage ('Deploy Milvus') {
options {
timeout(time: 10, unit: 'MINUTES') // timeout on this stage
timeout(time: 15, unit: 'MINUTES') // timeout on this stage
}
steps {
container('main') {
......@@ -121,7 +115,6 @@ pipeline {
}
sh "echo ${image_tag_modified}"
sh "echo ${params.chaos_type}"
sh "docker pull ${params.image_repository}:${image_tag_modified}"
sh "helm repo add milvus https://milvus-io.github.io/milvus-helm"
sh "helm repo update"
if ("${params.pod_name}" == "standalone"){
......
......@@ -42,9 +42,19 @@ pipeline {
defaultValue: 'master-latest'
)
string(
description: 'Pod Nums',
name: 'pod_nums',
defaultValue: '1'
description: 'Etcd Image Repository',
name: 'etcd_image_repository',
defaultValue: "bitnami/etcd"
)
string(
description: 'Etcd Image Tag',
name: 'etcd_image_tag',
defaultValue: "3.5.0-debian-10-r24"
)
string(
description: 'Query Replic Nums',
name: 'querynode_nums',
defaultValue: '3'
)
booleanParam(
description: 'Keep Env',
......@@ -76,17 +86,24 @@ pipeline {
container('main') {
dir ('tests/python_client/chaos') {
script {
sh "yq -i '.kafka.enabled = true' cluster-values.yaml"
sh "yq -i '.pulsar.enabled = false' cluster-values.yaml"
sh "cat cluster-values.yaml"
sh"""
yq -i '.kafka.enabled = true' cluster-values.yaml
yq -i '.pulsar.enabled = false' cluster-values.yaml
yq -i '.queryNode.replicas = "${params.querynode_nums}"' 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.repository = "${params.etcd_image_repository}"' standalone-values.yaml
yq -i '.etcd.image.tag = "${params.etcd_image_tag}"' standalone-values.yaml
"""
}
}
}
}
}
}
stage ('Deploy Milvus') {
options {
timeout(time: 10, unit: 'MINUTES') // timeout on this stage
timeout(time: 15, unit: 'MINUTES') // timeout on this stage
}
steps {
container('main') {
......@@ -101,7 +118,6 @@ pipeline {
}
sh "echo ${image_tag_modified}"
sh "echo ${params.chaos_type}"
sh "docker pull ${params.image_repository}:${image_tag_modified}"
sh "helm repo add milvus https://milvus-io.github.io/milvus-helm"
sh "helm repo update"
if ("${params.pod_name}" == "standalone"){
......
......@@ -51,16 +51,16 @@ pipeline {
string(
description: 'Etcd Image Repository',
name: 'etcd_image_repository',
defaultValue: "milvusdb/etcd"
defaultValue: "bitnami/etcd"
)
string(
description: 'Etcd Image Tag',
name: 'etcd_image_tag',
defaultValue: "3.5.0-debian-10-r117"
defaultValue: "3.5.0-debian-10-r24"
)
string(
description: 'Query Replic Nums',
name: 'querynode_replica_nums',
description: 'Querynode Nums',
name: 'querynode_nums',
defaultValue: '3'
)
string(
......@@ -105,7 +105,7 @@ pipeline {
dir ('tests/python_client/deploy') {
script {
sh """
yq -i '.queryNode.replicas = "${params.querynode_replica_nums}"' cluster-values.yaml
yq -i '.queryNode.replicas = "${params.querynode_nums}"' 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.repository = "${params.etcd_image_repository}"' standalone-values.yaml
......@@ -119,7 +119,7 @@ pipeline {
}
stage ('First Milvus Deployment') {
options {
timeout(time: 10, unit: 'MINUTES') // timeout on this stage
timeout(time: 15, unit: 'MINUTES') // timeout on this stage
}
steps {
container('main') {
......@@ -152,8 +152,6 @@ pipeline {
sh "echo ${new_image_tag_modified} > new_image_tag_modified.txt"
stash includes: 'new_image_tag_modified.txt', name: 'new_image_tag_modified'
env.new_image_tag_modified = new_image_tag_modified
sh "docker pull ${params.old_image_repository}:${old_image_tag_modified}"
sh "docker pull ${params.new_image_repository}:${new_image_tag_modified}"
if ("${params.deploy_task}" == "reinstall"){
echo "reinstall Milvus with new image tag"
old_image_tag_modified = new_image_tag_modified
......@@ -183,6 +181,9 @@ pipeline {
}
}
stage ('Run first test') {
options {
timeout(time: 30, unit: 'MINUTES') // timeout on this stage
}
steps {
container('main') {
dir ('tests/python_client/deploy/scripts') {
......@@ -275,6 +276,9 @@ pipeline {
}
stage ('Run Second Test') {
options {
timeout(time: 30, unit: 'MINUTES') // timeout on this stage
}
steps {
container('main') {
dir ('tests/python_client/deploy/scripts') {
......
......@@ -48,6 +48,21 @@ pipeline {
name: 'new_image_tag',
defaultValue: 'master-latest'
)
string(
description: 'Etcd Image Repository',
name: 'etcd_image_repository',
defaultValue: "bitnami/etcd"
)
string(
description: 'Etcd Image Tag',
name: 'etcd_image_tag',
defaultValue: "3.5.0-debian-10-r24"
)
string(
description: 'Querynode Nums',
name: 'querynode_nums',
defaultValue: '3'
)
string(
description: 'Data Size',
name: 'data_size',
......
......@@ -9,8 +9,8 @@ image:
etcd:
replicaCount: 3
image:
repository: milvusdb/etcd
tag: 3.5.0-debian-10-r117
repository: bitnami/etcd
tag: 3.5.0-debian-10-r24
minio:
resources:
......
......@@ -8,8 +8,8 @@ image:
etcd:
replicaCount: 1
image:
repository: milvusdb/etcd
tag: 3.5.0-debian-10-r117
repository: bitnami/etcd
tag: 3.5.0-debian-10-r24
minio:
mode: standalone
pulsar:
......
......@@ -9,8 +9,8 @@ image:
etcd:
replicaCount: 3
image:
repository: milvusdb/etcd
tag: 3.5.0-debian-10-r117
repository: bitnami/etcd
tag: 3.5.0-debian-10-r24
minio:
resources:
......
......@@ -8,8 +8,8 @@ image:
etcd:
replicaCount: 1
image:
repository: milvusdb/etcd
tag: 3.5.0-debian-10-r117
repository: bitnami/etcd
tag: 3.5.0-debian-10-r24
minio:
mode: standalone
pulsar:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册