From 0bb415f59359ff0e12b3ed88b2bd9b34520f81c7 Mon Sep 17 00:00:00 2001
From: zhuwenxing <wenxing.zhu@zilliz.com>
Date: Mon, 20 Jun 2022 11:16:13 +0800
Subject: [PATCH] [skip e2e]Update jenkinsfile for chaos and deploy test
 (#17630)

Signed-off-by: zhuwenxing <wenxing.zhu@zilliz.com>
---
 build/ci/jenkins/ChaosTest.groovy        | 2 +-
 build/ci/jenkins/ChaosTestKafkaMQ.groovy | 2 +-
 build/ci/jenkins/DeployTest.groovy       | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/ci/jenkins/ChaosTest.groovy b/build/ci/jenkins/ChaosTest.groovy
index c4972316b0..98321bf663 100644
--- a/build/ci/jenkins/ChaosTest.groovy
+++ b/build/ci/jenkins/ChaosTest.groovy
@@ -214,7 +214,7 @@ pipeline {
                         }
                         if ("${params.chaos_task}" == "data-consist-test"){
                             def host = sh(returnStdout: true, script: "kubectl get svc/${env.RELEASE_NAME}-milvus -o jsonpath=\"{.spec.clusterIP}\"").trim()
-                            sh "pytest -s -v test_chaos_data_consist.py --host $host --log-cli-level=INFO --capture=no || echo "chaos test fail" "                           
+                            sh "pytest -s -v test_chaos_data_consist.py --host $host --log-cli-level=INFO --capture=no || echo 'chaos test fail' "                           
                         }
                         echo "chaos test done"
                         sh "kubectl wait --for=condition=Ready pod -l app.kubernetes.io/instance=${env.RELEASE_NAME} -n ${env.NAMESPACE} --timeout=360s"
diff --git a/build/ci/jenkins/ChaosTestKafkaMQ.groovy b/build/ci/jenkins/ChaosTestKafkaMQ.groovy
index 3c8234faf4..34e18f67eb 100644
--- a/build/ci/jenkins/ChaosTestKafkaMQ.groovy
+++ b/build/ci/jenkins/ChaosTestKafkaMQ.groovy
@@ -217,7 +217,7 @@ pipeline {
                         }
                         if ("${params.chaos_task}" == "data-consist-test"){
                             def host = sh(returnStdout: true, script: "kubectl get svc/${env.RELEASE_NAME}-milvus -o jsonpath=\"{.spec.clusterIP}\"").trim()
-                            sh "pytest -s -v test_chaos_data_consist.py --host $host --log-cli-level=INFO --capture=no || echo "chaos test fail" "
+                            sh "pytest -s -v test_chaos_data_consist.py --host $host --log-cli-level=INFO --capture=no || echo 'chaos test fail' "
                         }
                         echo "chaos test done"
                         sh "kubectl wait --for=condition=Ready pod -l app.kubernetes.io/instance=${env.RELEASE_NAME} -n ${env.NAMESPACE} --timeout=360s"
diff --git a/build/ci/jenkins/DeployTest.groovy b/build/ci/jenkins/DeployTest.groovy
index b8fd183fec..b6ff167187 100644
--- a/build/ci/jenkins/DeployTest.groovy
+++ b/build/ci/jenkins/DeployTest.groovy
@@ -271,7 +271,7 @@ pipeline {
 
         stage ('Second Milvus Deployment') {
             options {
-              timeout(time: 15, unit: 'MINUTES')   // timeout on this stage
+              timeout(time: 20, unit: 'MINUTES')   // timeout on this stage
             }
             steps {
                 container('main') {
@@ -297,8 +297,9 @@ pipeline {
                             if ("${params.milvus_mode}" == "cluster") {
                                 sh "helm upgrade --wait --timeout 720s ${env.RELEASE_NAME} milvus/milvus  --set image.all.repository=${params.new_image_repository} --set image.all.tag=${new_image_tag_modified} -f cluster-values.yaml"    
                             }
-                            sh "kubectl wait --for=condition=Ready pod -l app.kubernetes.io/instance=${env.RELEASE_NAME} -n ${env.NAMESPACE} --timeout=360s"
-                            sh "kubectl wait --for=condition=Ready pod -l release=${env.RELEASE_NAME} -n ${env.NAMESPACE} --timeout=360s"                               
+                            sh "sleep 60s"
+                            // sh "kubectl wait --for=condition=Ready pod -l app.kubernetes.io/instance=${env.RELEASE_NAME} -n ${env.NAMESPACE} --timeout=360s"
+                            // sh "kubectl wait --for=condition=Ready pod -l release=${env.RELEASE_NAME} -n ${env.NAMESPACE} --timeout=360s"                               
                             sh "kubectl get pods -o wide|grep ${env.RELEASE_NAME}"
                         }
                     }