Merge pull request #7271 from taosdata/revert-7256-test/skipci_master

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

.drone.yml

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

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,7 +146,6 @@ 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'''
@@ -161,7 +160,6 @@ pipeline {
               changeRequest()
                expression {
                     env.skipstage != 0
-                    env.skipbuild ==1
               }
           }
       parallel {