From 1e1d038f731f0368b5da6548ddfedc0fcf22a382 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Thu, 18 Feb 2021 16:28:45 +0800
Subject: [PATCH 1/4] [TD-2980]<test>add nodejs connector test into CI

---
 tests/Jenkinsfile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/Jenkinsfile b/tests/Jenkinsfile
index f5b0cf1478..aa1815fc63 100644
--- a/tests/Jenkinsfile
+++ b/tests/Jenkinsfile
@@ -109,6 +109,13 @@ pipeline {
                 java --class-path=../../../../src/connector/jdbc/target:$JAVA_HOME/jre/lib/ext -jar target/JDBCDemo-SNAPSHOT-jar-with-dependencies.jar -host 127.0.0.1
                 '''
             }
+            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                sh '''
+                cp -rf ${WKC}/tests/examples/nodejs ${JENKINS_HOME}/workspace/
+                cd ${JENKINS_HOME}/workspace/nodejs
+                node nodejsChecker.js host=localhost
+                '''
+            }
             catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                 sh '''
                 cd ${JENKINS_HOME}/workspace/C#NET/src/CheckC#

From 889c6be4dde6aed3cfc31cdd6e8fd00d2b5413e5 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Thu, 18 Feb 2021 16:45:41 +0800
Subject: [PATCH 2/4] fix Jenkinsfile error

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

diff --git a/Jenkinsfile b/Jenkinsfile
index d7d2ab6a9a..25245edd6c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,7 +5,7 @@ node {
     git url: 'https://github.com/taosdata/TDengine.git'
 }
 
-def kipstage=0
+def skipstage=0
 def abortPreviousBuilds() {
   def currentJobName = env.JOB_NAME
   def currentBuildNumber = env.BUILD_NUMBER.toInteger()

From a154d1328ea081d0f0ef3f779945ca951c2c0cb5 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Thu, 18 Feb 2021 17:57:00 +0800
Subject: [PATCH 3/4] balance

---
 Jenkinsfile                      | 3 ++-
 tests/script/jenkins/basic_2.txt | 1 -
 tests/script/jenkins/basic_4.txt | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 25245edd6c..571d776a96 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -88,8 +88,9 @@ pipeline {
           git checkout -qf FETCH_HEAD
           '''
           script{
-            skipstage=sh(script:"git --no-pager diff --name-only FETCH_HEAD develop|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 0 ",returnStdout:true) 
+            env.skipstage=sh(script:"cd ${WORKSPACE}.tes && git --no-pager diff --name-only FETCH_HEAD develop|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 0 ",returnStdout:true) 
           }
+          println env.skipstage
           sh'''
           rm -rf ${WORKSPACE}.tes
           '''
diff --git a/tests/script/jenkins/basic_2.txt b/tests/script/jenkins/basic_2.txt
index 20e574711a..5a2a6f4062 100644
--- a/tests/script/jenkins/basic_2.txt
+++ b/tests/script/jenkins/basic_2.txt
@@ -72,4 +72,3 @@ cd ../../../debug; make
 ./test.sh -f unique/cluster/cache.sim
 ./test.sh -f unique/cluster/vgroup100.sim
 
-./test.sh -f unique/column/replica3.sim
\ No newline at end of file
diff --git a/tests/script/jenkins/basic_4.txt b/tests/script/jenkins/basic_4.txt
index 2f2ed147a2..7735c5b3d5 100644
--- a/tests/script/jenkins/basic_4.txt
+++ b/tests/script/jenkins/basic_4.txt
@@ -35,4 +35,6 @@
 ./test.sh -f general/stable/refcount.sim
 ./test.sh -f general/stable/show.sim
 ./test.sh -f general/stable/values.sim
-./test.sh -f general/stable/vnode3.sim
\ No newline at end of file
+./test.sh -f general/stable/vnode3.sim
+
+./test.sh -f unique/column/replica3.sim
\ No newline at end of file

From 38f6e4a6ac31f39f56ff1394c3a10e8db205aecd Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Thu, 18 Feb 2021 18:19:22 +0800
Subject: [PATCH 4/4] fix

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 571d776a96..d007adf736 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -102,7 +102,7 @@ pipeline {
         when {
               changeRequest()
                expression {
-                    skipstage != 0
+                    env.skipstage != 0
               }
           }
       parallel {