cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Guard against errors loading system tests

Browse source
This commit is contained in:
Christopher Baines 2020-04-07 18:17:01 +01:00
parent 7db6a8fa03
commit cdcc6140aa
1 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

37
guix-data-service/jobs/load-new-guix-revision.scm
View file

@ -333,17 +333,29 @@ WHERE job_id = $1"
column))))) column)))))
(all-system-tests)))) (all-system-tests))))
(let ((system-test-data (catch
(with-time-logging "getting system tests" #t
(inferior-eval-with-store inf store extract)))) (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-names-by-system)
(for-each (lambda (derivation-file-name) (for-each (lambda (derivation-file-name)
(add-temp-root store derivation-file-name)) (add-temp-root store derivation-file-name))
(map cdr derivation-file-names-by-system))) (map cdr derivation-file-names-by-system)))
(map third system-test-data)) (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 (all-inferior-lint-warnings inf store)
(define locales (define locales
@ -1153,9 +1165,10 @@ WHERE job_id = $1"
guix-revision-id guix-revision-id
lint-warning-ids))) lint-warning-ids)))
(insert-system-tests-for-guix-revision conn (when inferior-system-tests
guix-revision-id (insert-system-tests-for-guix-revision conn
inferior-system-tests) guix-revision-id
inferior-system-tests))
(let ((package-derivation-ids (let ((package-derivation-ids
(with-time-logging "inferior-data->package-derivation-ids" (with-time-logging "inferior-data->package-derivation-ids"