Merge remote-tracking branch 'origin/1.x'

ao-apps · Feb 27, 2025 · 468b01b · 468b01b
2 parents 813d03f + 379bdc8
commit 468b01b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 22 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1140,21 +1140,24 @@ void analysisSteps() {
   script {
     try {
       timeout(time: 15, unit: 'MINUTES') {
+        tools = []
+        tools << checkStyle(pattern: 'target/checkstyle-result.xml', skipSymbolicLinks: true)
+        tools << java()
+        tools << javaDoc()
+        // Detect JUnit results from presence of surefire-reports directory
+        if (fileExists('target/surefire-reports')) {
+          tools << junitParser(pattern: 'target*/surefire-reports/TEST-*.xml', skipSymbolicLinks: true)
+        }
+        tools << mavenConsole()
+        // php()
+        // sonarQube(), // TODO: sonar-report.json not found
+        tools << spotBugs(pattern: 'target/spotbugsXml.xml', skipSymbolicLinks: true)
+        // taskScanner()
         recordIssues(
           aggregatingResults: true,
           skipPublishingChecks: true,
           sourceCodeEncoding: 'UTF-8',
-          tools: [
-            checkStyle(pattern: 'target/checkstyle-result.xml', skipSymbolicLinks: true),
-            java(),
-            javaDoc(),
-            // junitParser(),
-            mavenConsole(),
-            // php()
-            // sonarQube(), // TODO: sonar-report.json not found
-            spotBugs(pattern: 'target/spotbugsXml.xml', skipSymbolicLinks: true)
-            // taskScanner()
-          ]
+          tools: tools
         )
       }
     } catch (org.jenkinsci.plugins.workflow.steps.FlowInterruptedException e) {

diff --git a/book/Jenkinsfile b/book/Jenkinsfile
@@ -1135,21 +1135,24 @@ void analysisSteps() {
   script {
     try {
       timeout(time: 15, unit: 'MINUTES') {
+        tools = []
+        tools << checkStyle(pattern: 'target/checkstyle-result.xml', skipSymbolicLinks: true)
+        tools << java()
+        tools << javaDoc()
+        // Detect JUnit results from presence of surefire-reports directory
+        if (fileExists('target/surefire-reports')) {
+          tools << junitParser(pattern: 'target*/surefire-reports/TEST-*.xml', skipSymbolicLinks: true)
+        }
+        tools << mavenConsole()
+        // php()
+        // sonarQube(), // TODO: sonar-report.json not found
+        tools << spotBugs(pattern: 'target/spotbugsXml.xml', skipSymbolicLinks: true)
+        // taskScanner()
         recordIssues(
           aggregatingResults: true,
           skipPublishingChecks: true,
           sourceCodeEncoding: 'UTF-8',
-          tools: [
-            checkStyle(pattern: 'target/checkstyle-result.xml', skipSymbolicLinks: true),
-            java(),
-            javaDoc(),
-            // junitParser(),
-            mavenConsole(),
-            // php()
-            // sonarQube(), // TODO: sonar-report.json not found
-            spotBugs(pattern: 'target/spotbugsXml.xml', skipSymbolicLinks: true)
-            // taskScanner()
-          ]
+          tools: tools
         )
       }
     } catch (org.jenkinsci.plugins.workflow.steps.FlowInterruptedException e) {