Merge pull request #5694 from taosdata/test/jenkins

[TD-3671]<test>change target branch

Jenkinsfile

@@ -50,7 +50,16 @@ def pre_test(){
     git clean -dfx
     cd ${WK}
     git reset --hard HEAD~10
-    git checkout develop 
+    '''
+    script {
+      if (env.CHANGE_TARGET == 'master') {
+        sh 'git checkout master'
+        }
+      else {
+        sh 'git checkout develop'
+      } 
+    }
+    sh '''
     git pull >/dev/null 
     cd ${WK}
     export TZ=Asia/Harbin
@@ -92,7 +101,8 @@ pipeline {
           git pull
           git fetch origin +refs/pull/${CHANGE_ID}/merge
           git checkout -qf FETCH_HEAD
-          '''
+          '''     
+          
           script{
             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) 
           }
@@ -185,14 +195,12 @@ pipeline {
             rm -rf /var/log/taos/*
             ./handle_crash_gen_val_log.sh
             '''
-            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                sh '''
-                cd ${WKC}/tests/pytest
-                rm -rf /var/lib/taos/*
-                rm -rf /var/log/taos/*
-                ./handle_taosd_val_log.sh
-                '''
-            }
+            sh '''
+            cd ${WKC}/tests/pytest
+            rm -rf /var/lib/taos/*
+            rm -rf /var/log/taos/*
+            ./handle_taosd_val_log.sh
+            '''
             timeout(time: 45, unit: 'MINUTES'){
                 sh '''
                 date

tests/pytest/concurrent_inquiry.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 
 # This is the script for us to try to cause the TDengine server or client to crash
 #    

tests/pytest/handle_taosd_val_log.sh

@@ -21,7 +21,7 @@ rm -rf /var/lib/taos/*
 nohup valgrind  --leak-check=yes $TAOSD_DIR > $TDIR/$VALGRIND_OUT 2> $TDIR/$VALGRIND_ERR  &
 sleep 20
 cd -
-./crash_gen.sh  -p -t 10 -s 200 
+./crash_gen.sh  -p -t 10 -s 1000 
 ps -ef |grep valgrind|grep -v grep|awk '{print $2}'|xargs kill -term
 while true 
 do