From f6b6bd1994a187990767a605bf4db69d527152c8 Mon Sep 17 00:00:00 2001 From: zhuwenxing Date: Thu, 26 May 2022 22:08:09 +0800 Subject: [PATCH] [skip e2e]Update etcd image for deploy and chaos test (#17232) Signed-off-by: zhuwenxing --- build/ci/jenkins/ChaosTest.groovy | 33 +++++++++++++++++++ build/ci/jenkins/DeployTest.groovy | 33 +++++++++++++++++++ tests/python_client/chaos/cluster-values.yaml | 24 ++++++++------ .../chaos/standalone-values.yaml | 3 ++ .../python_client/deploy/cluster-values.yaml | 4 +++ .../deploy/standalone-values.yaml | 3 ++ 6 files changed, 90 insertions(+), 10 deletions(-) diff --git a/build/ci/jenkins/ChaosTest.groovy b/build/ci/jenkins/ChaosTest.groovy index cf4c416c4..5bb75ff51 100644 --- a/build/ci/jenkins/ChaosTest.groovy +++ b/build/ci/jenkins/ChaosTest.groovy @@ -41,6 +41,21 @@ pipeline { name: 'image_tag', defaultValue: 'master-latest' ) + string( + description: 'Etcd Image Repository', + name: 'etcd_image_repository', + defaultValue: "milvusdb/etcd" + ) + string( + description: 'Etcd Image Tag', + name: 'etcd_image_tag', + defaultValue: "3.5.0-debian-10-r117" + ) + string( + description: 'Query Replic Nums', + name: 'querynode_replica_nums', + defaultValue: '3' + ) string( description: 'Pod Nums', name: 'pod_nums', @@ -71,6 +86,24 @@ pipeline { } } } + stage ('Modify Milvus chart values') { + steps { + container('main') { + dir ('tests/python_client/chaos') { + script { + sh """ + yq -i '.queryNode.replicas = "${params.querynode_replica_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 + """ + } + } + } + } + } stage ('Deploy Milvus') { options { timeout(time: 10, unit: 'MINUTES') // timeout on this stage diff --git a/build/ci/jenkins/DeployTest.groovy b/build/ci/jenkins/DeployTest.groovy index 4596fb2bf..ea8bcc683 100644 --- a/build/ci/jenkins/DeployTest.groovy +++ b/build/ci/jenkins/DeployTest.groovy @@ -48,6 +48,21 @@ pipeline { name: 'new_image_tag', defaultValue: 'master-latest' ) + string( + description: 'Etcd Image Repository', + name: 'etcd_image_repository', + defaultValue: "milvusdb/etcd" + ) + string( + description: 'Etcd Image Tag', + name: 'etcd_image_tag', + defaultValue: "3.5.0-debian-10-r117" + ) + string( + description: 'Query Replic Nums', + name: 'querynode_replica_nums', + defaultValue: '3' + ) string( description: 'Data Size', name: 'data_size', @@ -84,6 +99,24 @@ pipeline { } } } + stage ('Modify Milvus chart values') { + steps { + container('main') { + dir ('tests/python_client/deploy') { + script { + sh """ + yq -i '.queryNode.replicas = "${params.querynode_replica_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 + """ + } + } + } + } + } stage ('First Milvus Deployment') { options { timeout(time: 10, unit: 'MINUTES') // timeout on this stage diff --git a/tests/python_client/chaos/cluster-values.yaml b/tests/python_client/chaos/cluster-values.yaml index 8830d7138..30dbed151 100644 --- a/tests/python_client/chaos/cluster-values.yaml +++ b/tests/python_client/chaos/cluster-values.yaml @@ -8,6 +8,10 @@ image: etcd: replicaCount: 3 + image: + repository: milvusdb/etcd + tag: 3.5.0-debian-10-r117 + minio: resources: requests: @@ -24,7 +28,7 @@ pulsar: extra: bastion: no wsproxy: no - + autorecovery: resources: requests: @@ -45,7 +49,7 @@ pulsar: -Xms256m -Xmx256m PULSAR_GC: > -XX:MaxDirectMemorySize=512m - httpNumThreads: "50" + httpNumThreads: "50" bookkeeper: replicaCount: 2 @@ -85,14 +89,14 @@ pulsar: -Xms512m -Xmx512m PULSAR_GC: > - -Dcom.sun.management.jmxremote - -Djute.maxbuffer=10485760 - -XX:+ParallelRefProcEnabled - -XX:+UnlockExperimentalVMOptions - -XX:+DoEscapeAnalysis - -XX:+DisableExplicitGC - -XX:+PerfDisableSharedMem - -Dzookeeper.forceSync=no + -Dcom.sun.management.jmxremote + -Djute.maxbuffer=10485760 + -XX:+ParallelRefProcEnabled + -XX:+UnlockExperimentalVMOptions + -XX:+DoEscapeAnalysis + -XX:+DisableExplicitGC + -XX:+PerfDisableSharedMem + -Dzookeeper.forceSync=no broker: replicaCount: 1 resources: diff --git a/tests/python_client/chaos/standalone-values.yaml b/tests/python_client/chaos/standalone-values.yaml index 73b876520..42592e5a4 100644 --- a/tests/python_client/chaos/standalone-values.yaml +++ b/tests/python_client/chaos/standalone-values.yaml @@ -7,6 +7,9 @@ image: pullPolicy: IfNotPresent etcd: replicaCount: 1 + image: + repository: milvusdb/etcd + tag: 3.5.0-debian-10-r117 minio: mode: standalone pulsar: diff --git a/tests/python_client/deploy/cluster-values.yaml b/tests/python_client/deploy/cluster-values.yaml index b8e32274f..48877f117 100644 --- a/tests/python_client/deploy/cluster-values.yaml +++ b/tests/python_client/deploy/cluster-values.yaml @@ -8,6 +8,10 @@ image: etcd: replicaCount: 3 + image: + repository: milvusdb/etcd + tag: 3.5.0-debian-10-r117 + minio: resources: requests: diff --git a/tests/python_client/deploy/standalone-values.yaml b/tests/python_client/deploy/standalone-values.yaml index 2f137aa04..eac8ba740 100644 --- a/tests/python_client/deploy/standalone-values.yaml +++ b/tests/python_client/deploy/standalone-values.yaml @@ -7,6 +7,9 @@ image: pullPolicy: IfNotPresent etcd: replicaCount: 1 + image: + repository: milvusdb/etcd + tag: 3.5.0-debian-10-r117 minio: mode: standalone pulsar: -- GitLab