From 3652b9da5b3ad2ab81ecbde01c6905e4ec10f437 Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Wed, 7 Jul 2021 18:38:01 +0800
Subject: [PATCH] Add timeout delay for e2e test jenkins pipeline (#6342)

Signed-off-by: quicksilver <zhifeng.zhang@zilliz.com>
---
 build/ci/jenkins/Jenkinsfile      | 8 +++++++-
 build/ci/jenkins/NightlyCI.groovy | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/build/ci/jenkins/Jenkinsfile b/build/ci/jenkins/Jenkinsfile
index 870a637773..9f84835d09 100644
--- a/build/ci/jenkins/Jenkinsfile
+++ b/build/ci/jenkins/Jenkinsfile
@@ -1,10 +1,14 @@
 #!/usr/bin/env groovy
 
+int timeout_minutes = 30
+int delay_minutes = 5
+int ci_timeout = (timeout_minutes - delay_minutes) * 60
+
 pipeline {
     agent none
     options {
         timestamps()
-        timeout(time: 30, unit: 'MINUTES')
+        timeout(time: timeout_minutes, unit: 'MINUTES')
         buildDiscarder logRotator(artifactDaysToKeepStr: '30')
         // parallelsAlwaysFailFast()
 
@@ -54,6 +58,7 @@ pipeline {
                                         if ("${MILVUS_CLIENT}" == "pymilvus") {
                                             sh """
                                             MILVUS_CLUSTER_ENABLED=${clusterEnabled} \
+                                            timeout ${ci_timeout} \
                                             ./e2e-k8s.sh \
                                             --node-image registry.zilliz.com/kindest/node:v1.20.2 \
                                             --kind-config "${env.WORKSPACE}/build/config/topology/trustworthy-jwt-ci.yaml" \
@@ -62,6 +67,7 @@ pipeline {
                                         } else if ("${MILVUS_CLIENT}" == "pymilvus-orm") {
                                             sh """
                                             MILVUS_CLUSTER_ENABLED=${clusterEnabled} \
+                                            timeout ${ci_timeout} \
                                             ./e2e-k8s.sh \
                                             --node-image registry.zilliz.com/kindest/node:v1.20.2 \
                                             --kind-config "${env.WORKSPACE}/build/config/topology/trustworthy-jwt-ci.yaml" \
diff --git a/build/ci/jenkins/NightlyCI.groovy b/build/ci/jenkins/NightlyCI.groovy
index bd494ddfd7..bddab3a263 100644
--- a/build/ci/jenkins/NightlyCI.groovy
+++ b/build/ci/jenkins/NightlyCI.groovy
@@ -5,6 +5,10 @@
 String cron_timezone = "TZ=Asia/Shanghai"
 String cron_string = BRANCH_NAME == "master" ? "50 22 * * * " : ""
 
+int timeout_minutes = 90
+int delay_minutes = 5
+int ci_timeout = (timeout_minutes - delay_minutes) * 60
+
 pipeline {
     agent none
     triggers {
@@ -13,7 +17,7 @@ pipeline {
     }
     options {
         timestamps()
-        timeout(time: 90, unit: 'MINUTES')
+        timeout(time: timeout_minutes, unit: 'MINUTES')
         buildDiscarder logRotator(artifactDaysToKeepStr: '30')
         // parallelsAlwaysFailFast()
     }
@@ -62,6 +66,7 @@ pipeline {
                                         if ("${MILVUS_CLIENT}" == "pymilvus") {
                                             sh """
                                             MILVUS_CLUSTER_ENABLED=${clusterEnabled} \
+                                            timeout ${ci_timeout} \
                                             ./e2e-k8s.sh \
                                             --kind-config "${env.WORKSPACE}/build/config/topology/trustworthy-jwt-ci.yaml" \
                                             --node-image registry.zilliz.com/kindest/node:v1.20.2
@@ -69,6 +74,7 @@ pipeline {
                                         } else if ("${MILVUS_CLIENT}" == "pymilvus-orm") {
                                             sh """
                                             MILVUS_CLUSTER_ENABLED=${clusterEnabled} \
+                                            timeout ${ci_timeout} \
                                             ./e2e-k8s.sh \
                                             --kind-config "${env.WORKSPACE}/build/config/topology/trustworthy-jwt-ci.yaml" \
                                             --node-image registry.zilliz.com/kindest/node:v1.20.2 \