This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch feature/SLING-7245
in repository https://gitbox.apache.org/repos/asf/sling-tooling-jenkins.git
The following commit(s) were added to refs/heads/feature/SLING-7245 by this
push:
new 229d1da SLING-7245 - Validate pull requests using Jenkins
229d1da is described below
commit 229d1da06f1a59ed250ff06cd988824ec9ef38fd
Author: Robert Munteanu <[email protected]>
AuthorDate: Tue Dec 18 00:06:06 2018 +0100
SLING-7245 - Validate pull requests using Jenkins
Actually take into account desired goal, make label more compact.
---
vars/slingOsgiBundleBuild.groovy | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/vars/slingOsgiBundleBuild.groovy b/vars/slingOsgiBundleBuild.groovy
index 817e7fc..8c5a4f3 100644
--- a/vars/slingOsgiBundleBuild.groovy
+++ b/vars/slingOsgiBundleBuild.groovy
@@ -32,13 +32,13 @@ def call(Map params = [:]) {
deploy = true
buildDesc.jdks.each { jdkVersion ->
def goal = buildDesc.mavenGoal ? buildDesc.mavenGoal : ( deploy ?
"deploy" : "verify" )
- stage("Build (Java ${jdkVersion}, goal : ${goal})") {
+ stage("Build (Java ${jdkVersion}, ${goal})") {
def jenkinsJdkLabel = availableJDKs[jdkVersion]
if ( !jenkinsJdkLabel )
throw new RuntimeException("Unknown JDK version
${jdkVersion}")
withMaven(maven: mvnVersion, jdk: jenkinsJdkLabel ) {
dir(moduleDir) {
- sh 'mvn clean install'
+ sh "mvn clean ${goal}"
}
}
}