Merge pull request #2177 from olamy/feature/jenkinsfile-multiple-jdk-build

add multiple jdks build

Jenkinsfile

@@ -1,9 +1,22 @@
 #!groovy
 
-node {
+def jdks = ["jdk8", "jdk9"]
+def oss = ["linux"] //windows?
+def builds = [:]
+for (def os in oss) {
+  for (def jdk in jdks) {
+    builds[os+"_"+jdk] = getFullBuild( jdk, os )
+  }
+}
+
+parallel builds
+
+def getFullBuild(jdk, os) {
+  return {
+    node(os) {
       // System Dependent Locations
       def mvntool = tool name: 'maven3', type: 'hudson.tasks.Maven$MavenInstallation'
-  def jdktool = tool name: 'jdk8', type: 'hudson.model.JDK'
+      def jdktool = tool name: "$jdk", type: 'hudson.model.JDK'
 
       // Environment
       List mvnEnv = ["PATH+MVN=${mvntool}/bin", "PATH+JDK=${jdktool}/bin", "JAVA_HOME=${jdktool}/", "MAVEN_HOME=${mvntool}"]
@@ -15,7 +28,7 @@ node {
           checkout scm
         }
       } catch (Exception e) {
-    notifyBuild("Checkout Failure")
+        notifyBuild("Checkout Failure", jdk)
         throw e
       }
 
@@ -24,12 +37,12 @@ node {
         stage('Compile') {
           withEnv(mvnEnv) {
             timeout(time: 15, unit: 'MINUTES') {
-          sh "mvn -B clean install -Dtest=None"
+              sh "mvn -V -B clean install -Dtest=None"
             }
           }
         }
       } catch(Exception e) {
-    notifyBuild("Compile Failure")
+        notifyBuild("Compile Failure", jdk)
         throw e
       }
 
@@ -38,12 +51,12 @@ node {
         stage('Javadoc') {
           withEnv(mvnEnv) {
             timeout(time: 20, unit: 'MINUTES') {
-          sh "mvn -B javadoc:javadoc"
+              sh "mvn -V -B javadoc:javadoc"
             }
           }
         }
       } catch(Exception e) {
-    notifyBuild("Javadoc Failure")
+        notifyBuild("Javadoc Failure", jdk)
         throw e
       }
 
@@ -53,10 +66,9 @@ node {
           withEnv(mvnEnv) {
             timeout(time: 90, unit: 'MINUTES') {
               // Run test phase / ignore test failures
-          sh "mvn -B install -Dmaven.test.failure.ignore=true -Prun-its"
+              sh "mvn -V -B install -Dmaven.test.failure.ignore=true -Prun-its"
               // Report failures in the jenkins UI
-          step([$class: 'JUnitResultArchiver', 
-              testResults: '**/target/surefire-reports/TEST-*.xml'])
+              junit testResults:'**/target/surefire-reports/TEST-*.xml'
               // Collect up the jacoco execution results
               def jacocoExcludes =
                       // build tools
@@ -92,29 +104,33 @@ node {
             }
             if(isUnstable())
             {
-          notifyBuild("Unstable / Test Errors")
+              notifyBuild("Unstable / Test Errors", jdk)
             }
           }
         }
       } catch(Exception e) {
-    notifyBuild("Test Failure")
+        notifyBuild("Test Failure", jdk)
         throw e
       }
 
       try
       {
-    stage 'Compact3'
+        stage ('Compact3') {
 
           dir("aggregates/jetty-all-compact3") {
             withEnv(mvnEnv) {
-        sh "mvn -B -Pcompact3 clean install"
+              sh "mvn -V -B -Pcompact3 clean install"
+            }
           }
         }
       } catch(Exception e) {
-    notifyBuild("Compact3 Failure")
+        notifyBuild("Compact3 Failure", jdk)
         throw e
       }
     }
+  }
+}
+
 
 // True if this build is part of the "active" branches
 // for Jetty.
@@ -122,7 +138,7 @@ def isActiveBranch()
 {
   def branchName = "${env.BRANCH_NAME}"
   return ( branchName == "master" ||
-           branchName.startsWith("jetty-") );
+          ( branchName.startsWith("jetty-") && branchName.endsWith(".x") ) );
 }
 
 // Test if the Jenkins Pipeline or Step has marked the
@@ -133,7 +149,7 @@ def isUnstable()
 }
 
 // Send a notification about the build status
-def notifyBuild(String buildStatus)
+def notifyBuild(String buildStatus, String jdk)
 {
   if ( !isActiveBranch() )
   {
@@ -145,7 +161,7 @@ def notifyBuild(String buildStatus)
   buildStatus = buildStatus ?: "UNKNOWN"
 
   def email = "${env.EMAILADDRESS}"
-  def summary = "${env.JOB_NAME}#${env.BUILD_NUMBER} - ${buildStatus}"
+  def summary = "${env.JOB_NAME}#${env.BUILD_NUMBER} - ${buildStatus} with jdk ${jdk}"
   def detail = """<h4>Job: <a href='${env.JOB_URL}'>${env.JOB_NAME}</a> [#${env.BUILD_NUMBER}]</h4>
     <p><b>${buildStatus}</b></p>
     <table>