diff --git a/.drone.yml b/.drone.yml index b520f308ba..710baa5bf3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -249,4 +249,3 @@ steps: branch: - develop - master - diff --git a/Jenkinsfile b/Jenkinsfile index dfa83fc592..40e19be486 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -142,6 +142,9 @@ pipeline { sh''' git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD + cd ${WORKSPACE}.tes + git --no-pager diff --name-only FETCH_HEAD ${env.CHANGE_TARGET}|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' + git log -1 --pretty=%B | fgrep -ie '[skip ci]' -e '[ci skip] ''' script{ @@ -157,7 +160,6 @@ pipeline { sh''' git log -1 --pretty=%B | fgrep -ie '[skip ci]' -e '[ci skip] ''' - currentBuild.getRawBuild().getExecutor().interrupt(Result.SUCCESS) } }