diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-04-12 10:26:37 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-04-12 11:55:41 +0200 |
| commit | fc37346ff493de7781107c7c3e75863ca7419e2b (patch) | |
| tree | ab5ff2d41d87f2a2048caec034234516056e022c /gnu/ci.scm | |
| parent | 05aa5f9f39d86f2e322246b33fa9542c97814af2 (diff) | |
| download | guix-fc37346ff493de7781107c7c3e75863ca7419e2b.tar.gz guix-fc37346ff493de7781107c7c3e75863ca7419e2b.tar.xz | |
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.
Diffstat (limited to 'gnu/ci.scm')
| -rw-r--r-- | gnu/ci.scm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gnu/ci.scm b/gnu/ci.scm index ff76ffde57..5ab1b51d82 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -317,25 +317,25 @@ SYSTEM." #:key source commit) "Return a list of jobs for the system tests." (define (->job test) - (parameterize ((current-guix-package - (channel-source->package source #:commit commit))) - (let ((name (string-append "test." (system-test-name test) - "." system)) - (drv (run-with-store store - (mbegin %store-monad - (set-current-system system) - (set-grafting #f) - (set-guile-for-build (default-guile)) - (system-test-value test))))) + (let ((name (string-append "test." (system-test-name test) + "." system)) + (drv (run-with-store store + (mbegin %store-monad + (set-current-system system) + (set-grafting #f) + (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) ;; Override the value of 'current-guix' used by system tests. Using a ;; channel instance makes tests that rely on 'current-guix' less ;; expensive. It also makes sure we get a valid Guix package when this ;; 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) |