Merge pull request #4640 from taosdata/test/testcase

fix jenkinsfile error

Jenkinsfile

@@ -40,14 +40,15 @@ def pre_test(){
     sh '''
     
     cd ${WKC}
-    rm -rf *
+    git checkout develop
+    git pull
+    git fetch
+    git checkout ${CHANGE_BRANCH}
+    git merge develop
     cd ${WK}
     git reset --hard
     git checkout develop
     git pull
-    cd ${WKC}
-    rm -rf *
-    mv ${WORKSPACE}/* .
     cd ${WK}
     export TZ=Asia/Harbin
     date

tests/Jenkinsfile

@@ -7,12 +7,12 @@ def pre_test(){
     sh '''
     cd ${WKC}
     git reset --hard
-    git checkout ${BRANCH}
+    git checkout $BRANCH_NAME
     git pull
     git submodule update
     cd ${WK}
     git reset --hard
-    git checkout ${BRANCH}
+    git checkout $BRANCH_NAME
     git pull
     export TZ=Asia/Harbin
     date
@@ -28,7 +28,7 @@ def pre_test(){
 pipeline {
   agent none
   environment{
-      BRANCH = $branch_name
+    
       WK = '/var/lib/jenkins/workspace/TDinternal'
       WKC= '/var/lib/jenkins/workspace/TDinternal/community'
   }