[maven-jenkins-lib] branch master updated: Also run site goal

[rf...@apache.org]

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

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git


The following commit(s) were added to refs/heads/master by this push:
     new 9010d1b  Also run site goal
9010d1b is described below

commit 9010d1b2669e22e97d132a36e95185743d6271fc
Author: rfscholte <rf...@apache.org>
AuthorDate: Fri Jun 29 21:27:44 2018 +0200

    Also run site goal
---
 vars/asfMavenTlpPlgnBuild.groovy | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/vars/asfMavenTlpPlgnBuild.groovy b/vars/asfMavenTlpPlgnBuild.groovy
index 61776c5..d09b258 100644
--- a/vars/asfMavenTlpPlgnBuild.groovy
+++ b/vars/asfMavenTlpPlgnBuild.groovy
@@ -37,6 +37,9 @@ def call(Map params = [:]) {
     def jdkMin = jdks[0];
     def mavens = params.containsKey('maven') ? params.maven : ['3.0.x','3.2.x','3.3.x','3.5.x']
     def failFast = params.containsKey('failFast') ? params.failFast : true
+    def siteJdk = params.containsKey('siteJdk') ? params.siteJdk : '8'
+    def siteMvn = params.containsKey('siteMvn') ? params.siteJdk : '3.5.x'
+    
     taskContext['failFast'] = failFast;
     Map tasks = [failFast: failFast]
     boolean first = true
@@ -44,12 +47,17 @@ def call(Map params = [:]) {
       for (def mvn in mavens) {
 	    def jdk = Math.max( jdkMin as Integer, jenkinsEnv.jdkForMaven( mvn ) as Integer) as String
 		jdks = jdks.findAll{ it != jdk }
-	    doCreateTask( os, jdk, mvn, tasks, first, taskContext )
+	    doCreateTask( os, jdk, mvn, tasks, first, 'build', taskContext )
       }
       for (def jdk in jdks) {
 	    def mvn = jenkinsEnv.mavenForJdk(jdk)
-	    doCreateTask( os, jdk, mvn, tasks, first, taskContext )
+	    doCreateTask( os, jdk, mvn, tasks, first, 'build', taskContext )
       }
+      
+      doCreateTask( os, siteJdk, siteMvn, tasks, first, 'site', taskContext )
+      
+      // run with apache-release profile, consider it a dryRun with SNAPSHOTs
+      // doCreateTask( os, siteJdk, siteMvn, tasks, first, 'release', taskContext )
     }
     // run the parallel builds
     parallel(tasks)
@@ -88,7 +96,7 @@ def call(Map params = [:]) {
   }
 }
 
-def doCreateTask( os, jdk, maven, tasks, first, taskContext )
+def doCreateTask( os, jdk, maven, goals, tasks, first, plan, taskContext )
 {
 	String label = jenkinsEnv.labelForOS(os);
 	String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}")
@@ -111,11 +119,23 @@ def doCreateTask( os, jdk, maven, tasks, first, taskContext )
 	  // Java 7u80 has TLS 1.2 disabled by default: need to explicitely enable
 	  cmd += '-Dhttps.protocols=TLSv1.2'
 	}
-	cmd += 'clean'
-	cmd += 'verify'
+
+	if (plan == 'build') {
+      cmd += 'clean'
+      cmd += 'verify'
+	}
+	else if (plan == 'site') {
+      cmd += 'site'
+      cmd += '-Preporting'
+	}
+	else if (plan == 'release') {
+      cmd += 'verify'
+      cmd += '-Papache-release'
+	}
+	
 	def disablePublishers = !first
 	first = false
-	String stageId = "${os}-jdk${jdk}_m${maven}"
+	String stageId = "${os}-jdk${jdk}-m${maven}_${plan}"
 	tasks[stageId] = {
 	  node(label) {
 		stage("Checkout ${stageId}") {