From 181fadd74d08176183721cbb723b3a0f41b9bc78 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Wed, 14 Oct 2020 19:30:06 +0800
Subject: [PATCH 1/2] [TD-1676] modify Jenkinsfile

---
 Jenkinsfile                    | 3 ++-
 tests/pytest/handle_val_log.sh | 0
 2 files changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 tests/pytest/handle_val_log.sh

diff --git a/Jenkinsfile b/Jenkinsfile
index 5a8f6a551e..55fa27cf28 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -118,4 +118,5 @@ pipeline {
     }
 
   }
-}
+  
+}
\ No newline at end of file
diff --git a/tests/pytest/handle_val_log.sh b/tests/pytest/handle_val_log.sh
old mode 100644
new mode 100755

From 331b838ffa6593901ebb72039147b76e8461c7bc Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Thu, 15 Oct 2020 11:38:17 +0800
Subject: [PATCH 2/2] [TD-1676] balance jenkins

---
 Jenkinsfile       | 25 +++++++++++++++++++++++++
 tests/test-all.sh |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 55fa27cf28..c262aa50f7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,6 +29,31 @@ pipeline {
 
     stage('Parallel test stage') {
       parallel {
+        stage('pytest') {
+          agent{label 'master'}
+          steps {
+            sh '''
+            date
+            cd ${WKC}
+            git checkout develop
+            git pull
+            git submodule update
+            cd ${WK}
+            git checkout develop
+            git pull
+            export TZ=Asia/Harbin
+            date
+            rm -rf ${WK}/debug
+            mkdir debug
+            cd debug
+            cmake .. > /dev/null
+            make > /dev/null
+            cd ${WKC}/tests
+            #./test-all.sh smoke
+            ./test-all.sh pytest
+            date'''
+          }
+        }
         stage('test_b1') {
           agent{label '184'}
           steps {
diff --git a/tests/test-all.sh b/tests/test-all.sh
index 983ef5ffec..e45dd15fed 100755
--- a/tests/test-all.sh
+++ b/tests/test-all.sh
@@ -121,7 +121,7 @@ if [ "$2" != "sim" ]; then
   elif [ "$1" == "full" ]; then
     echo "### run Python full test ###"
     runPyCaseOneByOne fulltest.sh
-  elif [ "$1" == "b1" ]; then
+  elif [ "$1" == "pytest" ]; then
     echo "### run Python full test ###"
     runPyCaseOneByOne fulltest.sh
   elif [ "$1" == "b2" ] || [ "$1" == "b3" ]; then