[sling-tooling-jenkins] branch master updated: SLING-8286 - Jenkins should not try and deploy release commits

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-tooling-jenkins.git


The following commit(s) were added to refs/heads/master by this push:
     new e4bb4ad  SLING-8286 - Jenkins should not try and deploy release commits
e4bb4ad is described below

commit e4bb4adf6196e51c2aaaf7e927b30d98c7651873
Author: Robert Munteanu <romb...@apache.org>
AuthorDate: Thu Feb 21 14:04:08 2019 +0100

    SLING-8286 - Jenkins should not try and deploy release commits
---
 vars/slingOsgiBundleBuild.groovy | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vars/slingOsgiBundleBuild.groovy b/vars/slingOsgiBundleBuild.groovy
index 15ef326..8f524a8 100644
--- a/vars/slingOsgiBundleBuild.groovy
+++ b/vars/slingOsgiBundleBuild.groovy
@@ -106,7 +106,8 @@ def defineStage(def globalConfig, def jobConfig, def 
jdkVersion, def isReference
     def jenkinsJdkLabel = jenkinsJdkLabel(jdkVersion, globalConfig)
 
     // do not deploy artifacts built from PRs or feature branches
-    if ( goal == "deploy" && env.BRANCH_NAME != "master" )
+    // also do not deploy non-SNAPSHOT versions
+    if ( goal == "deploy" && ( env.BRANCH_NAME != "master" || 
!readMavenPom().version.endsWith('-SNAPSHOT') ) )
         goal = "verify"
 
     def invocation = {