From e87a91471ee0517f1e856cf9cf11fe3ac3f131a0 Mon Sep 17 00:00:00 2001
From: zhuwenxing <wenxing.zhu@zilliz.com>
Date: Thu, 3 Aug 2023 09:29:05 +0800
Subject: [PATCH] ci: fix kafka e2e pipeline (#26053)

Signed-off-by: zhuwenxing <wenxing.zhu@zilliz.com>
---
 ci/jenkins/PR.groovy | 56 ++++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/ci/jenkins/PR.groovy b/ci/jenkins/PR.groovy
index 47914dafc5..c1b26cc852 100644
--- a/ci/jenkins/PR.groovy
+++ b/ci/jenkins/PR.groovy
@@ -96,9 +96,13 @@ pipeline {
                                     script {
                                         sh 'printenv'
                                         def clusterEnabled = "false"
+                                        def valuesFile = "pr.yaml"
                                         if ("${MILVUS_SERVER_TYPE}".contains('distributed')) {
                                             clusterEnabled = "true"
                                         }
+                                        if ("${MILVUS_SERVER_TYPE}".contains("kafka")) {
+                                            valuesFile = "pr_kafka.yaml"
+                                        }
 
                                         if ("${MILVUS_CLIENT}" == "pymilvus") {
                                             if ("${imageTag}"==''){
@@ -121,36 +125,36 @@ pipeline {
                                                     chmod +x /usr/bin/yq
                                                 '''
                                                 sh """
-
-                                                    yq -i '.pulsar.enabled=false' values/ci/pr.yaml
-                                                    yq -i '.kafka.enabled=true' values/ci/pr.yaml
-                                                    yq -i '.kafka.metrics.kafka.enabled=true' values/ci/pr.yaml
-                                                    yq -i '.kafka.metrics.jmx.enabled=true' values/ci/pr.yaml
-                                                    yq -i '.kafka.metrics.serviceMonitor.enabled=true' values/ci/pr.yaml
+                                                    cp values/ci/pr.yaml values/ci/pr_kafka.yaml
+                                                    yq -i '.pulsar.enabled=false' values/ci/pr_kafka.yaml
+                                                    yq -i '.kafka.enabled=true' values/ci/pr_kafka.yaml
+                                                    yq -i '.kafka.metrics.kafka.enabled=true' values/ci/pr_kafka.yaml
+                                                    yq -i '.kafka.metrics.jmx.enabled=true' values/ci/pr_kafka.yaml
+                                                    yq -i '.kafka.metrics.serviceMonitor.enabled=true' values/ci/pr_kafka.yaml
                                                 """
                                             }
                                             withCredentials([usernamePassword(credentialsId: "${env.CI_DOCKER_CREDENTIAL_ID}", usernameVariable: 'CI_REGISTRY_USERNAME', passwordVariable: 'CI_REGISTRY_PASSWORD')]){
                                                 sh """
-                                                MILVUS_CLUSTER_ENABLED=${clusterEnabled} \
-                                                MILVUS_HELM_REPO="http://nexus-nexus-repository-manager.nexus:8081/repository/milvus-proxy" \
-                                                TAG=${imageTag}\
-                                                ./e2e-k8s.sh \
-                                                --skip-export-logs \
-                                                --skip-cleanup \
-                                                --skip-setup \
-                                                --skip-test \
-                                                --skip-build \
-                                                --skip-build-image \
-                                                --install-extra-arg "
-                                                --set etcd.metrics.enabled=true \
-                                                --set etcd.metrics.podMonitor.enabled=true \
-                                                --set indexCoordinator.gc.interval=1 \
-                                                --set indexNode.disk.enabled=true \
-                                                --set queryNode.disk.enabled=true \
-                                                --set standalone.disk.enabled=true \
-                                                --version ${chart_version} \
-                                                -f values/ci/pr.yaml" 
-                                                """
+                                                    MILVUS_CLUSTER_ENABLED=${clusterEnabled} \
+                                                    MILVUS_HELM_REPO="http://nexus-nexus-repository-manager.nexus:8081/repository/milvus-proxy" \
+                                                    TAG=${imageTag}\
+                                                    ./e2e-k8s.sh \
+                                                    --skip-export-logs \
+                                                    --skip-cleanup \
+                                                    --skip-setup \
+                                                    --skip-test \
+                                                    --skip-build \
+                                                    --skip-build-image \
+                                                    --install-extra-arg "
+                                                    --set etcd.metrics.enabled=true \
+                                                    --set etcd.metrics.podMonitor.enabled=true \
+                                                    --set indexCoordinator.gc.interval=1 \
+                                                    --set indexNode.disk.enabled=true \
+                                                    --set queryNode.disk.enabled=true \
+                                                    --set standalone.disk.enabled=true \
+                                                    --version ${chart_version} \
+                                                    -f values/ci/${valuesFile}"
+                                                    """
                                             }
                                         } else {
                                             error "Error: Unsupported Milvus client: ${MILVUS_CLIENT}"