From df1bed48aae4b21e02c944aad9bc3954cfe299f2 Mon Sep 17 00:00:00 2001
From: tangfangzhi <fztang@taosdata.com>
Date: Wed, 1 Jun 2022 15:12:22 +0800
Subject: [PATCH] fix: dead lock in case of some test failure

---
 Jenkinsfile2 | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile2 b/Jenkinsfile2
index 923db6e7c0..82bf6f3a76 100644
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -333,19 +333,29 @@ pipeline {
                                         sleep 20
                                         service taosd status
                                     '''
-                                    linux_ready = 1
+                                }
+                            }
+                        }
+                        script {
+                            linux_ready = 1
+                        }
+                        catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                            timeout(time: 40, unit: 'MINUTES'){
+                                script {
                                     sh '''
                                         cd ${WKC}/tests/parallel_test
                                         export DEFAULT_RETRY_TIME=2
                                         date
                                         timeout 2100 time ./run.sh -e -m /home/m.json -t /tmp/cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 480
                                     '''
-                                    while(win_test_stage == 0){
-                                        sleep(12)
-                                    }
                                 }
                             }
                         }
+                        script {
+                            while(win_test_stage == 0){
+                                sleep(12)
+                            }
+                        }
                     }
                 }
             }