ci: Fix system-tests subset.

* gnu/ci.scm (system-test-jobs): Make sure that "all-system-tests" is also
covered by the "current-guix-package" parameter.
This commit is contained in:
Mathieu Othacehe 2021-04-12 10:26:37 +02:00
parent 05aa5f9f39
commit fc37346ff4
No known key found for this signature in database
GPG key ID: 8354763531769CA6

View file

@ -317,25 +317,25 @@ (define* (system-test-jobs store system
#:key source commit) #:key source commit)
"Return a list of jobs for the system tests." "Return a list of jobs for the system tests."
(define (->job test) (define (->job test)
(parameterize ((current-guix-package (let ((name (string-append "test." (system-test-name test)
(channel-source->package source #:commit commit))) "." system))
(let ((name (string-append "test." (system-test-name test) (drv (run-with-store store
"." system)) (mbegin %store-monad
(drv (run-with-store store (set-current-system system)
(mbegin %store-monad (set-grafting #f)
(set-current-system system) (set-guile-for-build (default-guile))
(set-grafting #f) (system-test-value test)))))
(set-guile-for-build (default-guile))
(system-test-value test)))))
(derivation->job name drv)))) (derivation->job name drv)))
(if (member system %guix-system-supported-systems) (if (member system %guix-system-supported-systems)
;; Override the value of 'current-guix' used by system tests. Using a ;; Override the value of 'current-guix' used by system tests. Using a
;; channel instance makes tests that rely on 'current-guix' less ;; channel instance makes tests that rely on 'current-guix' less
;; expensive. It also makes sure we get a valid Guix package when this ;; expensive. It also makes sure we get a valid Guix package when this
;; code is not running from a checkout. ;; code is not running from a checkout.
(map ->job (all-system-tests)) (parameterize ((current-guix-package
(channel-source->package source #:commit commit)))
(map ->job (all-system-tests)))
'())) '()))
(define (tarball-jobs store system) (define (tarball-jobs store system)