From 8eb2ec07de7adf1c0a91505235a0c390758a1ea4 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Mon, 9 Aug 2021 17:23:15 +0800
Subject: [PATCH] test[ci skip]

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

diff --git a/.drone.yml b/.drone.yml
index 318761361e..53b4ef738a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -248,5 +248,4 @@ steps:
   when:
     branch:
     - develop
-    - master
-    
\ No newline at end of file
+    - master
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index 8102c0e7ba..e023e690d4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -113,6 +113,9 @@ pipeline {
           agent{label 'master'}
           when {
               changeRequest()
+              not {
+                changelog '.*\\[ci skip\\].*'
+            }
           }
           steps {
             script{
@@ -146,19 +149,8 @@ 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) 
-            if(env.skipstage == 0 )
-            {
-              println env.skipstage
-              currentBuild.result = 'SUCCESS'
-              currentBuild.getRawBuild().getExecutor().interrupt(Result.SUCCESS)
-            }
-            if (sh(script: "git log -1 --pretty=%B | fgrep -ie '[skip ci]' -e '[ci skip]'", returnStatus: true) == 1) {
-              currentBuild.result = 'SUCCESS'
-              currentBuild.getRawBuild().getExecutor().interrupt(Result.SUCCESS)
-            }
           }
           println env.skipstage
-          
           sh'''
           rm -rf ${WORKSPACE}.tes
           '''
@@ -172,6 +164,9 @@ pipeline {
                expression {
                     env.skipstage != 0
               }
+              not {
+                changelog '.*\\[ci skip\\].*'
+            }
           }
       parallel {
         stage('python_1_s1') {