Add error reporting in init_docker_images()

Signed-off-by: Bence Szépkúti <[email protected]>
gabor-mezei-arm · Feb 8, 2023 · d8fabdc · d8fabdc
1 parent 0d5e957
commit d8fabdc
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 28 deletions.
diff --git a/vars/common.groovy b/vars/common.groovy
@@ -105,11 +105,37 @@ def get_docker_tag(platform) {
         return tag
 }
 
+Map wrap_report_errors(Map jobs) {
+    return jobs.collectEntries { name, job ->
+        [(name): {
+            try {
+                job()
+            } catch (err) {
+                StringWriter writer = new StringWriter()
+                PrintWriter printWriter = new PrintWriter(writer)
+                err.printStackTrace(printWriter)
+                printWriter.close()
+                echo """\
+Failed job: $name
+Caught: $writer
+"""
+                if (!currentBuild.resultIsWorseOrEqualTo('FAILURE')) {
+                    currentBuild.result = 'FAILURE'
+                    common.maybe_notify_github 'TLS Testing', 'FAILURE',
+                            "Failures: ${name}…"
+                }
+                throw err
+            }
+        }]
+    }
+}
+
+
 def init_docker_images() {
     stage('init-docker-images') {
-        def jobs = linux_platforms.collectEntries {
+        def jobs = wrap_report_errors(linux_platforms.collectEntries {
             platform -> gen_jobs.gen_dockerfile_builder_job(platform)
-        }
+        })
         jobs.failFast = false
         parallel jobs
     }

diff --git a/vars/mbedtls.groovy b/vars/mbedtls.groovy
@@ -23,31 +23,6 @@ import jenkins.scm.api.SCMSource
 import org.jenkinsci.plugins.github_branch_source.Connector
 import org.jenkinsci.plugins.github_branch_source.GitHubSCMSource
 
-Map wrap_report_errors(Map jobs) {
-    return jobs.collectEntries { name, job ->
-        [(name): {
-            try {
-                job()
-            } catch (err) {
-                StringWriter writer = new StringWriter()
-                PrintWriter printWriter = new PrintWriter(writer)
-                err.printStackTrace(printWriter)
-                printWriter.close()
-                echo """\
-Failed job: $name
-Caught: $writer
-"""
-                if (!currentBuild.resultIsWorseOrEqualTo('FAILURE')) {
-                    currentBuild.result = 'FAILURE'
-                    common.maybe_notify_github 'TLS Testing', 'FAILURE',
-                            "Failures: ${name}…"
-                }
-                throw err
-            }
-        }]
-    }
-}
-
 def run_tls_tests(label_prefix='') {
     try {
         def jobs = [:]
@@ -58,7 +33,7 @@ def run_tls_tests(label_prefix='') {
             jobs = jobs + gen_jobs.gen_abi_api_checking_job('ubuntu-16.04')
         }
 
-        jobs = wrap_report_errors(jobs)
+        jobs = common.wrap_report_errors(jobs)
 
         jobs.failFast = false
         parallel jobs