01/01: hydra: services: Fix Cuirass configuration.

[Clément Lassieur]

snape pushed a commit to branch master
in repository maintenance.

commit 641b9750c30cd8275765aaa6457aea961224f928
Author: Clément Lassieur <address@hidden>
Date:   Fri Jul 20 20:10:28 2018 +0200

    hydra: services: Fix Cuirass configuration.
    
    * hydra/modules/sysadmin/services.scm (guix-input): Take a NAME argument.
    (cuirass-specs): Use the correct input names.  Rename '#:proc-arguments' to
    '#:proc-args'.  Add specifications for the "staging" and "core-updates"
    branches.  Add missing '#:load-path-inputs' and '#:package-path-inputs'
    fields.
---
 hydra/modules/sysadmin/services.scm | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/hydra/modules/sysadmin/services.scm 
b/hydra/modules/sysadmin/services.scm
index 168c599..9380090 100644
--- a/hydra/modules/sysadmin/services.scm
+++ b/hydra/modules/sysadmin/services.scm
@@ -61,8 +61,8 @@
 ;;; Cuirass.
 ;;;
 
-(define* (guix-input #:optional (branch "master"))
-  `((#:name . "guix")
+(define* (guix-input name #:optional (branch "master"))
+  `((#:name . ,name)
     (#:url . "https://git.savannah.gnu.org/git/guix.git";)
     (#:load-path . ".")
     (#:branch . ,branch)
@@ -72,19 +72,36 @@
   "Return the Cuirass specifications to build Guix for the given SYSTEMS."
   #~(list `((#:name . "guix-master")
             (#:load-path-inputs . ("guix"))
-
+            (#:package-path-inputs . ())
             (#:proc-input . "guix")
             (#:proc-file . "build-aux/cuirass/gnu-system.scm")
             (#:proc . cuirass-jobs)
-            (#:proc-arguments (subset . "all") (systems address@hidden))
-            (#:inputs . ,(list #$(guix-input "master"))))
-
+            (#:proc-args (subset . "all") (systems address@hidden))
+            (#:inputs . (#$(guix-input "guix" "master"))))
           `((#:name . "guix-modular-master")
-            (#:proc-input . "guix")
+            (#:load-path-inputs . ("guix-modular"))
+            (#:package-path-inputs . ())
+            (#:proc-input . "guix-modular")
             (#:proc-file . "build-aux/cuirass/guix-modular.scm")
             (#:proc . cuirass-jobs)
-            (#:proc-arguments (systems address@hidden))
-            (#:inputs . ,(list #$(guix-input "master"))))))
+            (#:proc-args (systems address@hidden))
+            (#:inputs . (#$(guix-input "guix-modular" "master"))))
+          `((#:name . "staging-staging")
+            (#:load-path-inputs . ("staging"))
+            (#:package-path-inputs . ())
+            (#:proc-input . "staging")
+            (#:proc-file . "build-aux/cuirass/gnu-system.scm")
+            (#:proc . cuirass-jobs)
+            (#:proc-args (systems address@hidden))
+            (#:inputs . (#$(guix-input "staging" "staging"))))
+          `((#:name . "core-updates-core-updates")
+            (#:load-path-inputs . ("core-updates"))
+            (#:package-path-inputs . ())
+            (#:proc-input . "core-updates")
+            (#:proc-file . "build-aux/cuirass/gnu-system.scm")
+            (#:proc . cuirass-jobs)
+            (#:proc-args (subset . core) (systems address@hidden))
+            (#:inputs . (#$(guix-input "core-updates" "core-updates"))))))
 
 
 ;;;