From dfdd43598c36f8cf1d2314f97447e2f092dadf6c Mon Sep 17 00:00:00 2001
From: tangfangzhi <fztang@taosdata.com>
Date: Sun, 24 Apr 2022 15:02:32 +0800
Subject: [PATCH 1/3] run python test in 3.0 ci

---
 Jenkinsfile2 | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Jenkinsfile2 b/Jenkinsfile2
index 441cf89626..a2043797c0 100644
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -88,6 +88,12 @@ def pre_test(){
     cmake .. > /dev/null
     make -j4> /dev/null
     '''
+    sh'''
+    cd ${WKPY}
+    git reset --hard
+    git pull
+    pip3 install .
+    '''
     return 1
 }
 
@@ -97,6 +103,7 @@ pipeline {
   environment{
       WK = '/var/lib/jenkins/workspace/TDinternal'
       WKC= '/var/lib/jenkins/workspace/TDengine'
+      WKPY= '/var/lib/jenkins/workspace/taos-connector-python'
   }
   stages {
       stage('pre_build'){
@@ -117,6 +124,11 @@ pipeline {
               ./test-all.sh b1fq
               '''
               sh'''
+              export LD_LIBRARY_PATH=${WKC}/debug/build/lib
+              cd ${WKC}/tests/system-test
+              ./fulltest.sh
+              '''
+              sh'''
               cd ${WKC}/debug
               ctest
               '''

From 4ae6e090d8e275b6ef0a3eff07652b55edde1b69 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Sun, 24 Apr 2022 15:29:53 +0800
Subject: [PATCH 2/3] fix hb broken link issue

---
 source/libs/qworker/src/qworkerMsg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libs/qworker/src/qworkerMsg.c b/source/libs/qworker/src/qworkerMsg.c
index 6723eb21c1..e0bcfabdd3 100644
--- a/source/libs/qworker/src/qworkerMsg.c
+++ b/source/libs/qworker/src/qworkerMsg.c
@@ -339,7 +339,7 @@ int32_t qwRegisterHbBrokenLinkArg(SQWorkerMgmt *mgmt, uint64_t sId, SQWConnInfo
     .ahandle = pConn->ahandle,
     .msgType = TDMT_VND_QUERY_HEARTBEAT,
     .pCont   = msg,
-    .contLen = sizeof(SSchedulerHbReq),
+    .contLen = msgSize,
     .code    = TSDB_CODE_RPC_NETWORK_UNAVAIL,
   };
   

From 28f9f135a9819086a87b5d33f0f7d9e246c66a92 Mon Sep 17 00:00:00 2001
From: tangfangzhi <fztang@taosdata.com>
Date: Sun, 24 Apr 2022 19:12:25 +0800
Subject: [PATCH 3/3] change test order

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

diff --git a/Jenkinsfile2 b/Jenkinsfile2
index a2043797c0..cca886d4af 100644
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -120,8 +120,8 @@ pipeline {
             timeout(time: 45, unit: 'MINUTES'){
               pre_test()
               sh'''
-              cd ${WKC}/tests
-              ./test-all.sh b1fq
+              cd ${WKC}/debug
+              ctest
               '''
               sh'''
               export LD_LIBRARY_PATH=${WKC}/debug/build/lib
@@ -129,8 +129,8 @@ pipeline {
               ./fulltest.sh
               '''
               sh'''
-              cd ${WKC}/debug
-              ctest
+              cd ${WKC}/tests
+              ./test-all.sh b1fq
               '''
             }
           }