[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: hydra: services: Switch to Cuirass new specificat
From: |
Mathieu Othacehe |
Subject: |
branch master updated: hydra: services: Switch to Cuirass new specification format. |
Date: |
Wed, 10 Mar 2021 10:07:36 -0500 |
This is an automated email from the git hooks/post-receive script.
mothacehe pushed a commit to branch master
in repository maintenance.
The following commit(s) were added to refs/heads/master by this push:
new 848a153 hydra: services: Switch to Cuirass new specification format.
848a153 is described below
commit 848a1539622b27a22262b322ca708c4cd5f8776e
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Wed Mar 10 16:06:29 2021 +0100
hydra: services: Switch to Cuirass new specification format.
* hydra/modules/sysadmin/services.scm (guix-input): Remove it.
(cuirass-notifications): New procedure.
(cuirass-specs): Adapt it to use Cuirass new specification format.
---
hydra/modules/sysadmin/services.scm | 123 ++++++++++++++++--------------------
1 file changed, 56 insertions(+), 67 deletions(-)
diff --git a/hydra/modules/sysadmin/services.scm
b/hydra/modules/sysadmin/services.scm
index d53507e..2a21cb7 100644
--- a/hydra/modules/sysadmin/services.scm
+++ b/hydra/modules/sysadmin/services.scm
@@ -215,84 +215,73 @@
;;; Cuirass.
;;;
-(define* (guix-input name #:optional (branch "master"))
- `((#:name . ,name)
- (#:url . "https://git.savannah.gnu.org/git/guix.git")
- (#:load-path . ".")
- (#:branch . ,branch)
- (#:no-compile? . #t)))
-
-(define (images-ouputs jobs)
+(define (images-outputs jobs)
(map (lambda (job)
- `((#:job . ,job)
- (#:type . "image")
- (#:output . "out")
- (#:path . "")))
+ `(build-output
+ (job ,job)
+ (type "image")
+ (path "")))
jobs))
+(define (cuirass-notifications)
+ #~(list (email
+ (from "cuirass@gnu.org")
+ (to "guix-ci@gnu.org")
+ (server "sendmail:///var/cuirass/cuirass-mailer"))))
+
(define (cuirass-specs branches systems)
"Return the Cuirass specifications to build Guix for the given SYSTEMS."
#~(list
#$@(if (member "master" branches)
- #~(`((#:name . "guix-master")
- (#:load-path-inputs . ())
- (#:package-path-inputs . ())
- (#:proc-input . "guix")
- (#:proc-file . "build-aux/cuirass/gnu-system.scm")
- (#:proc . cuirass-jobs)
- (#:proc-args (subset . "all") (systems #$@systems))
- (#:inputs . (#$(guix-input "guix" "master")))
- ;; Save the build output of the ISO9660-IMAGE job.
- (#:build-outputs . (((#:job . "iso9660-image*")
- (#:type . "ISO-9660")
- (#:output . "out")
- (#:path . ""))
- #$@(images-ouputs
- (list
- "hurd-barebones.qcow2"
- "pine64-barebones-raw-image"
- "pinebook-pro-barebones-raw-image"))
- ((#:job . "binary-tarball*")
- (#:type . "archive")
- (#:output . "out")
- (#:path . ""))))
- (#:priority . 2))
- `((#:name . "guix-modular-master")
- ;; Keep the load path empty: it uses the available Guix
modules
- ;; to build a trampoline.
- (#:load-path-inputs . ())
- (#:package-path-inputs . ())
- (#:proc-input . "guix-modular")
- (#:proc-file . "build-aux/cuirass/guix-modular.scm")
- (#:proc . cuirass-jobs)
- (#:proc-args (systems #$@systems))
- (#:inputs . (#$(guix-input "guix-modular" "master")))
- (#:build-outputs . ())
- (#:priority . 1)))
+ #~((specification
+ (name "guix-modular-master")
+ (build 'guix)
+ (notifications #$(cuirass-notifications))
+ (priority 1)
+ (systems '#$systems))
+ (specification
+ (name "guix-master")
+ (build 'all)
+ (build-outputs
+ (list
+ (build-output
+ (job "iso9660-image*")
+ (type "ISO-9660")
+ (path ""))
+ (build-output
+ (job "binary-tarball*")
+ (type "archive")
+ (path ""))
+ #$@(images-outputs
+ (list
+ "hurd-barebones.qcow2"
+ "pine64-barebones-raw-image"
+ "pinebook-pro-barebones-raw-image"))))
+ (notifications #$(cuirass-notifications))
+ (priority 2)
+ (systems '#$systems)))
#~())
#$@(if (member "staging" branches)
- #~(`((#:name . "staging-staging")
- (#:load-path-inputs . ())
- (#:package-path-inputs . ())
- (#:proc-input . "staging")
- (#:proc-file . "build-aux/cuirass/gnu-system.scm")
- (#:proc . cuirass-jobs)
- (#:proc-args (systems #$@systems))
- (#:inputs . (#$(guix-input "staging" "staging")))
- (#:build-outputs . ())
- (#:priority . 3)))
+ #~((specification
+ (name "staging")
+ (build 'all)
+ (channels
+ (list (channel
+ (inherit %default-guix-channel)
+ (branch "staging"))))
+ (priority 3)
+ (systems '#$systems)))
#~())
#$@(if (member "core-updates" branches)
- #~(`((#:name . "core-updates-core-updates")
- (#:load-path-inputs . ())
- (#:package-path-inputs . ())
- (#:proc-input . "core-updates")
- (#:proc-file . "build-aux/cuirass/gnu-system.scm")
- (#:proc . cuirass-jobs)
- (#:proc-args (subset . "core") (systems #$@systems))
- (#:inputs . (#$(guix-input "core-updates" "core-updates")))
- (#:build-outputs . ())
- (#:priority . 4)))
+ #~((specification
+ (name "core-updates")
+ (build 'core)
+ (channels
+ (list (channel
+ (inherit %default-guix-channel)
+ (branch "core-updates"))))
+ (priority 4)
+ (systems '#$systems)))
#~())))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: hydra: services: Switch to Cuirass new specification format.,
Mathieu Othacehe <=