[brooklyn-server] branch master updated: 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)

[he...@apache.org]

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-server.git


The following commit(s) were added to refs/heads/master by this push:
     new 6387b7b  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)
     new 482da12  This closes #1078
6387b7b is described below

commit 6387b7bfa92205747c9c3770f44debd9535c0d49
Author: Thomas Bouron <th...@cloudsoftcorp.com>
AuthorDate: Mon Dec 16 11:57:01 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 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 @@ node(label: 'ubuntu') {
                     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'
-                    }
-                }
-            }
         }
     }