02/03: hydra: bayfront: Use 'tests/gnu-system.scm' from Cuirass.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository maintenance.

commit 2f5fba6f1d4360f4dc28b40200b196fa2297a62e
Author: Ludovic Courtès <address@hidden>
Date:   Mon Jan 2 00:02:22 2017 +0100

    hydra: bayfront: Use 'tests/gnu-system.scm' from Cuirass.
    
    * hydra/bayfront.scm (%cuirass-specs): Change #:file argument to be an
    absolute file name, using 'file-append'.
---
 hydra/bayfront.scm |   24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/hydra/bayfront.scm b/hydra/bayfront.scm
index 2149d92..7cf3db5 100644
--- a/hydra/bayfront.scm
+++ b/hydra/bayfront.scm
@@ -1,8 +1,8 @@
 ;; OS configuration for bayfront, the frontend of the compile farm.
 
-(use-modules (gnu) (sysadmin people))
+(use-modules (gnu) (guix) (sysadmin people))
 (use-service-modules base networking admin mcron ssh web cuirass)
-(use-package-modules admin linux ssh tls vim package-management web wget)
+(use-package-modules admin linux ssh tls vim package-management web wget ci)
 
 (define %sysadmins
   ;; The sysadmins.
@@ -79,13 +79,19 @@
 
 (define %cuirass-specs
   ;; Cuirass specifications to build Guix.
-  (list `((#:name . "guix")
-          (#:url . "git://git.savannah.gnu.org/guix.git")
-          (#:load-path . ".")
-          (#:file . "tests/gnu-system.scm")
-          (#:proc . hydra-jobs)
-          (#:arguments (subset . "all"))
-          (#:branch . "master"))))
+  #~(list `((#:name . "guix")
+            (#:url . "git://git.savannah.gnu.org/guix.git")
+            (#:load-path . ".")
+
+            ;; FIXME: Currently this must be an absolute file name because
+            ;; the 'evaluate' command of Cuirass loads it with
+            ;; 'primitive-load'.
+            (#:file . #$(file-append (package-source cuirass)
+                                     "/tests/gnu-system.scm"))
+
+            (#:proc . hydra-jobs)
+            (#:arguments (subset . "all"))
+            (#:branch . "master"))))
 
 
 ;;;