Merge pull request #7256 from taosdata/test/skipci_master

[TD-5909]test skip ci [ci skip]

.drone.yml

@@ -248,5 +248,4 @@ steps:
   when:
     branch:
     - develop
-    - master
-
+    - master
\ No newline at end of file

Jenkinsfile

@@ -6,7 +6,7 @@ node {
 }
 
 def skipstage=0
-
+def skipbuild=0
 def abortPreviousBuilds() {
   def currentJobName = env.JOB_NAME
   def currentBuildNumber = env.BUILD_NUMBER.toInteger()
@@ -146,6 +146,7 @@ pipeline {
           
           script{
             env.skipstage=sh(script:"cd ${WORKSPACE}.tes && git --no-pager diff --name-only FETCH_HEAD ${env.CHANGE_TARGET}|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 0 ",returnStdout:true) 
+            env.skipbuild=sh(script: "git log -1 --pretty=%B | fgrep -ie '[skip ci]' -e '[ci skip]'", returnStatus: true)
           }
           println env.skipstage
           sh'''
@@ -160,6 +161,7 @@ pipeline {
               changeRequest()
                expression {
                     env.skipstage != 0
+                    env.skipbuild ==1
               }
           }
       parallel {