From c10285f1a082185c4a3eee9fa5087baac8d6b582 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Thu, 25 Mar 2021 16:16:50 +0800
Subject: [PATCH] [TD-3443]<test>fix taosd deadlock in CI

---
 Jenkinsfile       |  2 +-
 tests/Jenkinsfile | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 221bf5e490..00bd7fff77 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,7 +39,7 @@ def pre_test(){
     sudo rmtaos || echo "taosd has not installed"
     '''
     sh '''
-    ps -ef | grep taosd | grep -v grep | awk '{print $2}' | xargs kill -9
+    ps -ef | grep taosd | grep -v grep | awk '{print $2}' | xargs kill -9  //avoid taosd deadlock
     cd ${WKC}
     git checkout develop
     git reset --hard HEAD~10 >/dev/null 
diff --git a/tests/Jenkinsfile b/tests/Jenkinsfile
index 7cdcfb2e24..cba172c35b 100644
--- a/tests/Jenkinsfile
+++ b/tests/Jenkinsfile
@@ -56,14 +56,8 @@ pipeline {
             cd ${WKC}/tests
             ./test-all.sh b1
             date'''
-            sh '''
-            cd ${WKC}/tests
-            ./test-all.sh full jdbc
-            date'''
-            sh '''
-            cd ${WKC}/tests
-            ./test-all.sh full unit
-            date'''
+            
+            
           }
         }
 
@@ -136,6 +130,10 @@ pipeline {
             ./test-all.sh b2
             date
             '''
+            sh '''
+            cd ${WKC}/tests
+            ./test-all.sh full unit
+            date'''
           }
         }
 
@@ -154,6 +152,10 @@ pipeline {
                 '''
             }
             sh '''
+            cd ${WKC}/tests
+            ./test-all.sh full jdbc
+            date'''
+            sh '''
             cd ${WKC}/tests/pytest
             ./valgrind-test.sh 2>&1 > mem-error-out.log
             ./handle_val_log.sh