diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-04-07 18:17:01 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-04-07 18:22:13 +0100 |
| commit | cdcc6140aacd9922ee6cc14a88d203f8783fa11a (patch) | |
| tree | 45799de895824667a148b404c5f013331ccef1b9 | |
| parent | 7db6a8fa03624ff21bf26598f340d24c8653a9cf (diff) | |
| download | data-service-cdcc6140aacd9922ee6cc14a88d203f8783fa11a.tar data-service-cdcc6140aacd9922ee6cc14a88d203f8783fa11a.tar.gz | |
Guard against errors loading system tests
| -rw-r--r-- | guix-data-service/jobs/load-new-guix-revision.scm | 41 |
1 files changed, 27 insertions, 14 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)))) - - (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)) + (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)) + + 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" |