From e4a67f8046445013895402e47352f55a308a3044 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Wed, 28 Jul 2021 14:22:18 +0800
Subject: [PATCH 1/3] update local CI

---
 tests/Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Jenkinsfile b/tests/Jenkinsfile
index c75427b5f4..fb96b669ff 100644
--- a/tests/Jenkinsfile
+++ b/tests/Jenkinsfile
@@ -48,7 +48,7 @@ pipeline {
           }
         }
         stage('test_b1') {
-          agent{label 'master'}
+          agent{label 'slad2'}
           steps {
             pre_test()
             
@@ -62,7 +62,7 @@ pipeline {
         }
 
         stage('test_crash_gen') {
-          agent{label "slad2"}
+          agent{label "slad3"}
           steps {
             pre_test()
             sh '''
@@ -141,7 +141,7 @@ pipeline {
         }
 
         stage('test_valgrind') {
-          agent{label "slad3"}
+          agent{label "slad4"}
 
           steps {
             pre_test()

From aac0aeddfdf81725e9deb21b79301c3816cbf4bb Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Wed, 28 Jul 2021 16:10:06 +0800
Subject: [PATCH 2/3] add  SANITIZER parameter

---
 tests/Jenkinsfile     | 29 ++++++++++++++++++++++++++++-
 tests/mas/Jenkinsfile | 29 ++++++++++++++++++++++++++++-
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/tests/Jenkinsfile b/tests/Jenkinsfile
index fb96b669ff..ed54515ba8 100644
--- a/tests/Jenkinsfile
+++ b/tests/Jenkinsfile
@@ -1,5 +1,32 @@
 def pre_test(){
    
+    sh '''
+    sudo rmtaos||echo 'no taosd installed'
+    '''
+    sh '''
+    cd ${WKC}
+    git reset --hard
+    git checkout $BRANCH_NAME
+    git pull
+    git submodule update
+    cd ${WK}
+    git reset --hard
+    git checkout $BRANCH_NAME
+    git pull
+    export TZ=Asia/Harbin
+    date
+    rm -rf ${WK}/debug
+    mkdir debug
+    cd debug
+    cmake -DMEMORY_SANITIZER=true .. > /dev/null
+    make > /dev/null
+    make install > /dev/null
+    pip3 install ${WKC}/src/connector/python
+    '''
+    return 1
+}
+def pre_test_p(){
+   
     sh '''
     sudo rmtaos||echo 'no taosd installed'
     '''
@@ -39,7 +66,7 @@ pipeline {
         stage('pytest') {
           agent{label 'slad1'}
           steps {
-            pre_test()
+            pre_test_p()
             sh '''
             cd ${WKC}/tests
             find pytest -name '*'sql|xargs rm -rf
diff --git a/tests/mas/Jenkinsfile b/tests/mas/Jenkinsfile
index ae2286298f..4dcc1d9c18 100644
--- a/tests/mas/Jenkinsfile
+++ b/tests/mas/Jenkinsfile
@@ -1,5 +1,32 @@
 def pre_test(){
    
+    sh '''
+    sudo rmtaos||echo 'no taosd installed'
+    '''
+    sh '''
+    cd ${WKC}
+    git reset --hard
+    git checkout $BRANCH_NAME
+    git pull
+    git submodule update
+    cd ${WK}
+    git reset --hard
+    git checkout $BRANCH_NAME
+    git pull
+    export TZ=Asia/Harbin
+    date
+    rm -rf ${WK}/debug
+    mkdir debug
+    cd debug
+    cmake -DMEMORY_SANITIZER=true .. > /dev/null
+    make > /dev/null
+    make install > /dev/null
+    pip3 install ${WKC}/src/connector/python/ || echo 0
+    '''
+    return 1
+}
+def pre_test_p(){
+   
     sh '''
     sudo rmtaos||echo 'no taosd installed'
     '''
@@ -39,7 +66,7 @@ pipeline {
         stage('pytest') {
           agent{label 'slam1'}
           steps {
-            pre_test()
+            pre_test_p()
             sh '''
             cd ${WKC}/tests
             find pytest -name '*'sql|xargs rm -rf

From a9c51e251a3f3c78a67168e63065a6e12283cb7b Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Wed, 28 Jul 2021 18:28:35 +0800
Subject: [PATCH 3/3] remove systemctl

---
 tests/Jenkinsfile     | 4 ++--
 tests/mas/Jenkinsfile | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/Jenkinsfile b/tests/Jenkinsfile
index ed54515ba8..b5b068381d 100644
--- a/tests/Jenkinsfile
+++ b/tests/Jenkinsfile
@@ -119,7 +119,7 @@ pipeline {
             }
             
             sh'''
-            systemctl start taosd 
+            nohup taosd >/dev/null & 
             sleep 10
             '''
             catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
@@ -155,7 +155,7 @@ pipeline {
                 '''
             }
             sh '''
-            systemctl stop taosd 
+            pkill -9 taosd 
             cd ${WKC}/tests
             ./test-all.sh b2
             date
diff --git a/tests/mas/Jenkinsfile b/tests/mas/Jenkinsfile
index 4dcc1d9c18..52b29da92e 100644
--- a/tests/mas/Jenkinsfile
+++ b/tests/mas/Jenkinsfile
@@ -119,7 +119,7 @@ pipeline {
             }
             
             sh'''
-            systemctl start taosd 
+            nohup taosd >/dev/null & 
             sleep 10
             '''
             catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
@@ -163,7 +163,7 @@ pipeline {
                 '''
             }
             sh '''
-            systemctl stop taosd 
+            pkill -9  taosd 
             cd ${WKC}/tests
             ./test-all.sh b2
             date