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) | |
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 ff76ffde570..5ab1b51d829 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm | |||
| @@ -317,25 +317,25 @@ SYSTEM." | |||
| 317 | #:key source commit) | 317 | #:key source commit) |
| 318 | "Return a list of jobs for the system tests." | 318 | "Return a list of jobs for the system tests." |
| 319 | (define (->job test) | 319 | (define (->job test) |
| 320 | (parameterize ((current-guix-package | 320 | (let ((name (string-append "test." (system-test-name test) |
| 321 | (channel-source->package source #:commit commit))) | 321 | "." system)) |
| 322 | (let ((name (string-append "test." (system-test-name test) | 322 | (drv (run-with-store store |
| 323 | "." system)) | 323 | (mbegin %store-monad |
| 324 | (drv (run-with-store store | 324 | (set-current-system system) |
| 325 | (mbegin %store-monad | 325 | (set-grafting #f) |
| 326 | (set-current-system system) | 326 | (set-guile-for-build (default-guile)) |
| 327 | (set-grafting #f) | 327 | (system-test-value test))))) |
| 328 | (set-guile-for-build (default-guile)) | ||
| 329 | (system-test-value test))))) | ||
| 330 | 328 | ||
| 331 | (derivation->job name drv)))) | 329 | (derivation->job name drv))) |
| 332 | 330 | ||
| 333 | (if (member system %guix-system-supported-systems) | 331 | (if (member system %guix-system-supported-systems) |
| 334 | ;; Override the value of 'current-guix' used by system tests. Using a | 332 | ;; Override the value of 'current-guix' used by system tests. Using a |
| 335 | ;; channel instance makes tests that rely on 'current-guix' less | 333 | ;; channel instance makes tests that rely on 'current-guix' less |
| 336 | ;; expensive. It also makes sure we get a valid Guix package when this | 334 | ;; expensive. It also makes sure we get a valid Guix package when this |
| 337 | ;; code is not running from a checkout. | 335 | ;; code is not running from a checkout. |
| 338 | (map ->job (all-system-tests)) | 336 | (parameterize ((current-guix-package |
| 337 | (channel-source->package source #:commit commit))) | ||
| 338 | (map ->job (all-system-tests))) | ||
| 339 | '())) | 339 | '())) |
| 340 | 340 | ||
| 341 | (define (tarball-jobs store system) | 341 | (define (tarball-jobs store system) |
