From 68215323f5e026e89df3aa8e983e8612cdbda627 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Fri, 26 Mar 2021 09:19:26 +0800
Subject: [PATCH 1/5] fix jenkins error

---
 Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 405476ae6e..af898cb1d2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,7 +39,8 @@ def pre_test(){
     sudo rmtaos || echo "taosd has not installed"
     '''
     sh '''
-    ps -ef | grep taosd | grep -v grep | awk '{print $2}' | xargs kill -9 
+    killall -9 taosd
+    killall -9 gdb
     cd ${WKC}
     git checkout develop
     git reset --hard HEAD~10 >/dev/null 

From 82f21e7f10e71a4d554e499e258f0a24ebf46a64 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Fri, 26 Mar 2021 09:44:24 +0800
Subject: [PATCH 2/5] fix

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index af898cb1d2..b91d7804b1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,8 +39,8 @@ def pre_test(){
     sudo rmtaos || echo "taosd has not installed"
     '''
     sh '''
-    killall -9 taosd
-    killall -9 gdb
+    killall -9 taosd ||echo "no taosd running"
+    killall -9 gdb || echo "no gdb running"
     cd ${WKC}
     git checkout develop
     git reset --hard HEAD~10 >/dev/null 

From a89140cf0cf96484dc610f2db8b2f17957862f5e Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Fri, 26 Mar 2021 09:48:27 +0800
Subject: [PATCH 3/5] fix

---
 Jenkinsfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b91d7804b1..daae5a5ad0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -47,7 +47,6 @@ def pre_test(){
     git pull >/dev/null
     git fetch origin +refs/pull/${CHANGE_ID}/merge
     git checkout -qf FETCH_HEAD
-    git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD develop)|grep -v -E '.*md|//src//connector|Jenkinsfile'
     find ${WKC}/tests/pytest -name \'*\'.sql -exec rm -rf {} \\;
     cd ${WK}
     git reset --hard HEAD~10

From 1cf439125cf4d25d90fb16ce5abe99b9958ed1b4 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Fri, 26 Mar 2021 09:53:17 +0800
Subject: [PATCH 4/5] balance

---
 tests/test-all.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test-all.sh b/tests/test-all.sh
index 17d42dafe5..ad3ad5fc94 100755
--- a/tests/test-all.sh
+++ b/tests/test-all.sh
@@ -229,15 +229,15 @@ if [ "$2" != "jdbc" ] && [ "$2" != "python" ] && [ "$2" != "unit" ]; then
     echo "### run TSIM b1 test ###"
     runSimCaseOneByOnefq b1 0
     runSimCaseOneByOnefq b4 0
-    runSimCaseOneByOnefq b5 0
-    runSimCaseOneByOnefq b6 0
     runSimCaseOneByOnefq b7 0
   elif [ "$1" == "b2" ]; then
     echo "### run TSIM b2 test ###"
     runSimCaseOneByOnefq b2 0
+    runSimCaseOneByOnefq b5 0
   elif [ "$1" == "b3" ]; then
     echo "### run TSIM b3 test ###"
     runSimCaseOneByOnefq b3 0
+    runSimCaseOneByOnefq b6 0
   elif [ "$1" == "b1fq" ]; then
     echo "### run TSIM b1 test ###"
     runSimCaseOneByOnefq b1 1

From a504403cbcc84c703b1606ca96addf7fc46db101 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Fri, 26 Mar 2021 09:57:26 +0800
Subject: [PATCH 5/5] fix

---
 tests/Jenkinsfile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/Jenkinsfile b/tests/Jenkinsfile
index cba172c35b..6db6351442 100644
--- a/tests/Jenkinsfile
+++ b/tests/Jenkinsfile
@@ -1,9 +1,8 @@
 def pre_test(){
-    catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                sh '''
-                sudo rmtaos
-                '''
-    }
+   
+    sh '''
+    sudo rmtaos||echo 'no taosd installed'
+    '''
     sh '''
     cd ${WKC}
     git reset --hard