From cbd5f344cffe36b1de8202f8360aa6468018d358 Mon Sep 17 00:00:00 2001
From: Yiqing Liu <yqliu@taosdata.com>
Date: Tue, 10 Aug 2021 10:15:28 +0800
Subject: [PATCH] Revert "[TD-5909]test skip ci [ci skip]"

---
 .drone.yml  | 3 ++-
 Jenkinsfile | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 53b4ef738a..b520f308ba 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -248,4 +248,5 @@ steps:
   when:
     branch:
     - develop
-    - master
\ No newline at end of file
+    - master
+
diff --git a/Jenkinsfile b/Jenkinsfile
index f1de92cded..e6e8a1df32 100644
--- a/Jenkinsfile
+++ b/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 {
-- 
GitLab