From ea7331ad25cacc56cfbb889d1cef5301953b05bc Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Thu, 14 Jan 2021 20:45:03 +0000
Subject: [PATCH] Don't ignore all system tests if computing one derivation
 fails

---
 guix-data-service/jobs/load-new-guix-revision.scm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm
index 0d9b979..e6660af 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -352,7 +352,11 @@ WHERE job_id = $1"
            (system-test-name system-test))
           (list (system-test-name system-test)
                 (system-test-description system-test)
-                (map (lambda (system)
+                (filter-map
+                 (lambda (system)
+                   (catch
+                     #t
+                     (lambda ()
                        (cons
                         system
                         (parameterize ((%current-system system))
@@ -360,7 +364,13 @@ WHERE job_id = $1"
                            (run-with-store store
                              (mbegin %store-monad
                                (system-test-value system-test)))))))
-                     (list ,@inferior-%supported-systems))
+                     (lambda (key . args)
+                       (simple-format
+                        (current-error-port)
+                        "guix-data-service: error computing derivation ~A: ~A\n"
+                        key args)
+                       #f)))
+                 (list ,@inferior-%supported-systems))
                 (match (system-test-location system-test)
                   (($ <location> file line column)
                    (list file