diff --git a/.drone.yml b/.drone.yml index cbe5c0331852b94e9e336f8d9ddb82f194979781..b520f308ba68e2acd631795fbcfbf91a1b64c2a9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -150,7 +150,6 @@ steps: branch: - develop - master - - 2.0 --- kind: pipeline name: build_trusty @@ -177,7 +176,6 @@ steps: branch: - develop - master - - 2.0 --- kind: pipeline name: build_xenial @@ -203,7 +201,6 @@ steps: branch: - develop - master - - 2.0 --- kind: pipeline @@ -229,7 +226,6 @@ steps: branch: - develop - master - - 2.0 --- kind: pipeline name: build_centos7 @@ -253,4 +249,4 @@ steps: branch: - develop - master - - 2.0 \ No newline at end of file + diff --git a/Jenkinsfile b/Jenkinsfile index 14bc6abfbdacc2bbbee3b99784a4595b72b37725..48388507221bc9c03823571632e05db2d13455ae 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() @@ -125,7 +125,6 @@ pipeline { agent{label 'master'} when { changeRequest() - } steps { script{ @@ -159,8 +158,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''' @@ -175,7 +172,6 @@ pipeline { changeRequest() expression { env.skipstage != 0 - env.skipbuild ==1 } } parallel {