nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hydra: Add jobs for the system tests. 

* build-aux/hydra/gnu-system.scm (%guixsd-supported-systems): New
variable.
(qemu-jobs): Use it.
(system-test-jobs): New procedure.
(hydra-jobs): Use it.
This commit is contained in:
Ludovic Courtès 2016-06-20 23:49:47 +02:00
parent a9601e2352
commit e702e26a38
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build-aux/hydra/gnu-system.scm
View File

@ -59,6 +59,7 @@
(gnu system) (gnu system)
(gnu system vm) (gnu system vm)
(gnu system install) (gnu system install)
(gnu tests)
(srfi srfi-1) (srfi srfi-1)
(srfi srfi-26) (srfi srfi-26)
(ice-9 match)) (ice-9 match))
@ -129,6 +130,9 @@ SYSTEM."
(file (string-append dir "/demo-os.scm"))) (file (string-append dir "/demo-os.scm")))
(read-operating-system file))) (read-operating-system file)))
(define %guixsd-supported-systems
'("x86_64-linux" "i686-linux"))
(define (qemu-jobs store system) (define (qemu-jobs store system)
"Return a list of jobs that build QEMU images for SYSTEM." "Return a list of jobs that build QEMU images for SYSTEM."
(define (->alist drv) (define (->alist drv)
@ -150,7 +154,7 @@ system.")
(define MiB (define MiB
(expt 2 20)) (expt 2 20))
(if (member system '("x86_64-linux" "i686-linux")) (if (member system %guixsd-supported-systems)
(list (->job 'qemu-image (list (->job 'qemu-image
(run-with-store store (run-with-store store
(mbegin %store-monad (mbegin %store-monad
@ -167,6 +171,23 @@ system.")
(* 1024 MiB)))))) (* 1024 MiB))))))
'())) '()))
(define (system-test-jobs store system)
"Return a list of jobs for the system tests."
(define (->job test)
(let ((name (string->symbol
(string-append "test." (system-test-name test)
"." system))))
`(,name . ,(lambda ()
(run-with-store store
(mbegin %store-monad
(set-current-system system)
(set-grafting #f)
(system-test-value test)))))))
(if (member system %guixsd-supported-systems)
(map ->job (all-system-tests))
'()))
(define (tarball-jobs store system) (define (tarball-jobs store system)
"Return Hydra jobs to build the self-contained Guix binary tarball." "Return Hydra jobs to build the self-contained Guix binary tarball."
(define (->alist drv) (define (->alist drv)
@ -274,6 +295,7 @@ valid."
system)))) system))))
(append (filter-map job all) (append (filter-map job all)
(qemu-jobs store system) (qemu-jobs store system)
(system-test-jobs store system)
(tarball-jobs store system) (tarball-jobs store system)
(cross-jobs system)))) (cross-jobs system))))
((core) ((core)