guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/03: hydra: Use the build job specification from Guix.


From: Ludovic Courtès
Subject: 02/03: hydra: Use the build job specification from Guix.
Date: Sat, 17 Feb 2018 19:26:05 -0500 (EST)

civodul pushed a commit to branch master
in repository maintenance.

commit 039b1832aac9d6ea8d1d1c2d749fabd49a73141b
Author: Ludovic Courtès <address@hidden>
Date:   Sun Feb 18 01:18:40 2018 +0100

    hydra: Use the build job specification from Guix.
    
    This was possible since Guix commit
    66bc1d2aaf74fc7eb4ef9b3519c69bd37142ffb3.
    
    * hydra/modules/sysadmin/services.scm (%cuirass-specs): Rename to...
    (cuirass-specs): ... this.  Make it a procedure.  Change the
    configuration to use "build-aux/cuirass/gnu-system.scm" and pass
    'systems' in #:arguments.
    (frontend-services): Add #:systems and adjust accordingly.
    * hydra/berlin-new.scm <top level>: Pass #:systems to
    'frontend-services'.
---
 hydra/berlin-new.scm                |  2 ++
 hydra/modules/sysadmin/services.scm | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/hydra/berlin-new.scm b/hydra/berlin-new.scm
index b6e2e0c..d5bdaf4 100644
--- a/hydra/berlin-new.scm
+++ b/hydra/berlin-new.scm
@@ -153,6 +153,8 @@ Happy hacking!\n"))
              (tor-service)
 
              (frontend-services %sysadmins
+                                #:systems '("x86_64-linux" "i686-linux"
+                                            "aarch64-linux")
                                 #:motd %motd
                                 #:nginx-config-file
                                 (file-append %nginx-config "/berlin.conf")
diff --git a/hydra/modules/sysadmin/services.scm 
b/hydra/modules/sysadmin/services.scm
index 188dab4..9f39bda 100644
--- a/hydra/modules/sysadmin/services.scm
+++ b/hydra/modules/sysadmin/services.scm
@@ -61,22 +61,21 @@
 ;;; Cuirass.
 ;;;
 
-(define %cuirass-specs
-  ;; Cuirass specifications to build Guix.
+(define (cuirass-specs systems)
+  "Return the Cuirass specifications to build Guix for the given SYSTEMS."
   #~(list `((#:name . "guix")
             ;; FIXME: The campus firewall blocks access to git://
             (#:url . "https://git.savannah.gnu.org/git/guix.git";)
             (#:load-path . ".")
 
-            ;; FIXME: Currently this must be an absolute file name because
-            ;; the 'evaluate' command of Cuirass loads it with
-            ;; 'primitive-load'.
-            ;; Use our own variant of Cuirass' 'examples/gnu-system.scm'.
-            (#:file . #$(local-file "../../cuirass-jobs.scm"))
+            ;; This file is loaded relative to the checkout.
+            (#:file . "build-aux/cuirass/gnu-system.scm")
+
             (#:no-compile? #t)      ;don't try to run ./bootstrap etc.
 
-            (#:proc . hydra-jobs)
-            (#:arguments (subset . "all"))
+            (#:proc . cuirass-jobs)
+
+            (#:arguments (subset . "all") (systems address@hidden))
             (#:branch . "master"))))
 
 
@@ -173,6 +172,7 @@
                             nginx-config-file
                             (max-jobs 5)
                             (cores 4)
+                            (systems '("x86_64-linux" "i686-linux"))
                             (motd %default-motd)
                             (nar-ttl (* 45 24 3600))
                             (publish-workers 6))
@@ -203,7 +203,7 @@
          (service cuirass-service-type
                   (cuirass-configuration
                    (interval (* 5 60))
-                   (specifications %cuirass-specs)))
+                   (specifications (cuirass-specs systems))))
 
          (service openssh-service-type)
          (service sysadmin-service-type sysadmins)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]