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)
diff --git a/Jenkinsfile b/Jenkinsfile
index 50bc00b..7fe54bb 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 @@
sh 'mvn clean install -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 -DskipTests -Duser.home=/var/maven -Duser.name=jenkins'
- }
- }
- }
}
}