From dc1401e6e9c428371a8675b78f89bde52a8876fb Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Mon, 9 Aug 2021 20:46:02 +0800
Subject: [PATCH] test[ci skip]

---
 Jenkinsfile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e023e690d4..f1de92cded 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()
@@ -113,9 +113,6 @@ pipeline {
           agent{label 'master'}
           when {
               changeRequest()
-              not {
-                changelog '.*\\[ci skip\\].*'
-            }
           }
           steps {
             script{
@@ -149,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'''
@@ -163,10 +161,8 @@ pipeline {
               changeRequest()
                expression {
                     env.skipstage != 0
+                    env.skipbuild ==1
               }
-              not {
-                changelog '.*\\[ci skip\\].*'
-            }
           }
       parallel {
         stage('python_1_s1') {
-- 
GitLab