From cdcc6140aacd9922ee6cc14a88d203f8783fa11a Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Tue, 7 Apr 2020 18:17:01 +0100
Subject: [PATCH] Guard against errors loading system tests

---
 .../jobs/load-new-guix-revision.scm           | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm
index 6731abf..ceb4e89 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -333,17 +333,29 @@ WHERE job_id = $1"
                          column)))))
         (all-system-tests))))
 
-  (let ((system-test-data
-         (with-time-logging "getting system tests"
-           (inferior-eval-with-store inf store extract))))
+  (catch
+    #t
+    (lambda ()
+      (let ((system-test-data
+             (with-time-logging "getting system tests"
+               (inferior-eval-with-store inf store extract))))
 
-    (for-each (lambda (derivation-file-names-by-system)
-                (for-each (lambda (derivation-file-name)
-                            (add-temp-root store derivation-file-name))
-                          (map cdr derivation-file-names-by-system)))
-              (map third system-test-data))
+        (for-each (lambda (derivation-file-names-by-system)
+                    (for-each (lambda (derivation-file-name)
+                                (add-temp-root store derivation-file-name))
+                              (map cdr derivation-file-names-by-system)))
+                  (map third system-test-data))
 
-    system-test-data))
+        system-test-data))
+    (lambda (key . args)
+      (display (backtrace) (current-error-port))
+      (display "\n" (current-error-port))
+      (simple-format
+       (current-error-port)
+       "error: all-inferior-system-tests: ~A: ~A\n"
+       key args)
+
+      #f)))
 
 (define (all-inferior-lint-warnings inf store)
   (define locales
@@ -1153,9 +1165,10 @@ WHERE job_id = $1"
                                                     guix-revision-id
                                                     lint-warning-ids)))
 
-            (insert-system-tests-for-guix-revision conn
-                                                   guix-revision-id
-                                                   inferior-system-tests)
+            (when inferior-system-tests
+              (insert-system-tests-for-guix-revision conn
+                                                     guix-revision-id
+                                                     inferior-system-tests))
 
             (let ((package-derivation-ids
                    (with-time-logging "inferior-data->package-derivation-ids"