Convert coverage_details into a per-branch value

Signed-off-by: Bence Szépkúti <[email protected]>
Mbed-TLS · Jul 9, 2024 · 60272b5 · 60272b5
1 parent 7ce223e
commit 60272b5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/org/mbed/tls/jenkins/BranchInfo.groovy b/src/org/mbed/tls/jenkins/BranchInfo.groovy
@@ -31,12 +31,16 @@ class BranchInfo {
     final Set<String> failed_builds
     final Set<String> outcome_stashes
 
+    /** Record coverage details for reporting */
+    String coverage_details
+
     BranchInfo() {
         this.all_all_sh_components = [:]
         this.has_min_requirements = false
         this.python_requirements_override_content = ''
         this.python_requirements_override_file = ''
         this.failed_builds = []
         this.outcome_stashes = []
+        this.coverage_details = 'Code coverage job did not run'
     }
 }
diff --git a/vars/common.groovy b/vars/common.groovy
@@ -366,13 +366,14 @@ done
     )
 }
 
-void send_email(String name, Collection<BranchInfo> infos, Map<String, String> coverage_details) {
+void send_email(String name, Collection<BranchInfo> infos) {
     String branches = infos*.branch.join(',')
     def failed_builds = infos.collectMany { info -> info.failed_builds}
+    String coverage_details = infos.collect({info -> "$info.branch:\n$info.coverage_details"}).join('\n\n')
     if (failed_builds) {
         failures = failed_builds.join(", ")
         emailbody = """
-${coverage_details['coverage']}
+$coverage_details
 
 Logs: ${env.BUILD_URL}
 
@@ -381,7 +382,7 @@ Failures: ${failures}
         recipients = env.TEST_FAIL_EMAIL_ADDRESS
     } else {
         emailbody = """
-${coverage_details['coverage']}
+$coverage_details
 
 Logs: ${env.BUILD_URL}
 """

diff --git a/vars/gen_jobs.groovy b/vars/gen_jobs.groovy
@@ -19,16 +19,11 @@
 
 import java.util.concurrent.Callable
 
-import groovy.transform.Field
-
 import net.sf.json.JSONObject
 import hudson.AbortException
 
 import org.mbed.tls.jenkins.BranchInfo
 
-//Record coverage details for reporting
-@Field coverage_details = ['coverage': 'Code coverage job did not run']
-
 Map<String, Closure> job(String label, Closure body) {
     return Collections.singletonMap(label, body)
 }
@@ -473,7 +468,7 @@ fi
 
     Closure post_success = {
         String coverage_log = readFile('coverage-summary.txt')
-        coverage_details['coverage'] = coverage_log.substring(
+        info.coverage_details = coverage_log.substring(
             coverage_log.indexOf('\nCoverage\n') + 1
         )
     }