This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit df2952cbd9e3dd0af976bc2d490c99a1b60f6b84 Author: Thomas Bouron <[email protected]> AuthorDate: Mon Dec 16 11:57:02 2019 +0000 Update Jenkinsfile to: - add the pipeline trigger on comment only if we are building a PR - not deploy artifacts when building master. This will be taken care of during the full brooklyn build on master (see Jenkinsfile configuration at the brooklyn root) --- Jenkinsfile | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a515bfd..fc02069 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,11 +18,13 @@ */ node(label: 'ubuntu') { - properties([ - pipelineTriggers([ - issueCommentTrigger('.*test this please.*') + if (env.CHANGE_ID) { + properties([ + pipelineTriggers([ + issueCommentTrigger('.*test this please.*') + ]) ]) - ]) + } catchError { def environmentDockerImage @@ -46,15 +48,6 @@ node(label: 'ubuntu') { sh 'mvn clean install -Prpm -Pdeb -Duser.home=/var/maven -Duser.name=jenkins' } } - - // Conditional stage to deploy artifacts, when not building a PR - if (env.CHANGE_ID == null) { - stage('Deploy artifacts') { - environmentDockerImage.inside('-i --name brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly -v ${WORKSPACE}:/usr/build -w /usr/build') { - sh 'mvn deploy -Prpm -Pdeb -DskipTests -Duser.home=/var/maven -Duser.name=jenkins' - } - } - } } }
