branch master updated: ci: Fix system-tests subset.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new fc37346  ci: Fix system-tests subset.
fc37346 is described below

commit fc37346ff493de7781107c7c3e75863ca7419e2b
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Mon Apr 12 10:26:37 2021 +0200

    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.
---
 gnu/ci.scm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/gnu/ci.scm b/gnu/ci.scm
index ff76ffd..5ab1b51 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)