Merge pull request #4740 from taosdata/test/jenkins

fix some errors

Jenkinsfile

@@ -43,7 +43,15 @@ def pre_test(){
     git checkout develop
     git pull
     git fetch
+    '''
+    catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                sh '''
+                git branch -D ${CHANGE_BRANCH}
+                '''
+    }
+    
     git checkout ${CHANGE_BRANCH}
+    git pull
     git merge develop
     cd ${WK}
     git reset --hard