fix naming for Jacoco

Signed-off-by: Olivier Lamy <olamy@apache.org>
jetty-project · May 20, 2024 · e8ae583 · e8ae583
1 parent dd4fd72
commit e8ae583
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -18,8 +18,8 @@ pipeline {
           steps {
             timeout( time: 180, unit: 'MINUTES' ) {
               checkout scm
-              mavenBuild( "jdk21", "clean install -Dmaven.test.failure.ignore=true -e ", "maven3", false)
-              mavenBuild( "jdk21", "clean javadoc:javadoc -e ", "maven3", true)
+              mavenBuild( "jdk21", "clean install -Dmaven.test.failure.ignore=true -e ", "maven3", true)
+              mavenBuild( "jdk21", "clean javadoc:javadoc -e ", "maven3", false)
             }
           }
         }
@@ -28,8 +28,7 @@ pipeline {
           steps {
             timeout( time: 180, unit: 'MINUTES' ) {
               checkout scm
-              mavenBuild( "jdk17", "clean install -Dmaven.test.failure.ignore=true -e javadoc:javadoc", "maven3", true)
-              mavenBuild( "jdk17", "clean javadoc:javadoc -e ", "maven3", true)
+              mavenBuild( "jdk17", "clean install -Dmaven.test.failure.ignore=true -e javadoc:javadoc", "maven3", false)
             }
           }
         }
@@ -38,8 +37,7 @@ pipeline {
           steps {
             timeout( time: 180, unit: 'MINUTES' ) {
               checkout scm
-              mavenBuild( "jdk11", "clean install -Dmaven.test.failure.ignore=true -e javadoc:javadoc", "maven3", true)
-              mavenBuild( "jdk11", "clean javadoc:javadoc -e ", "maven3", true)
+              mavenBuild( "jdk11", "clean install -Dmaven.test.failure.ignore=true -e javadoc:javadoc", "maven3", false)
             }
           }
         }
@@ -48,7 +46,7 @@ pipeline {
   }
 }
 
-def mavenBuild(jdk, cmdline, mvnName, skipJacoco) {
+def mavenBuild(jdk, cmdline, mvnName, recordJacoco) {
   script {
     try {
       withEnv(["JAVA_HOME=${ tool "$jdk" }",
@@ -62,8 +60,8 @@ def mavenBuild(jdk, cmdline, mvnName, skipJacoco) {
     }
     finally
     {
-          junit testResults: '**/target/surefire-reports/*.xml,**/target/invoker-reports/TEST*.xml', allowEmptyResults: true
-      if(!skipJacoco) {
+      junit testResults: '**/target/surefire-reports/*.xml,**/target/invoker-reports/TEST*.xml', allowEmptyResults: true
+      if(recordJacoco) {
           // Collect the JaCoCo execution results.
           jacoco inclusionPattern: '**/org/eclipse/jetty/reactive/**/*.class',
                   execPattern: '**/target/jacoco.exec',