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