me/guix
Archived
1
0
Fork 0
Code Activity

ci: Remove the job period argument.

Browse source 
Cuirass now deals with periodicity directly on specifications.

* gnu/ci.scm (derivation->job): Remove the period argument.
(image-jobs, system-test-jobs, tarball-jobs): Adapt them.
This commit is contained in:
Mathieu Othacehe 2021-04-08 14:03:50 +02:00
parent 5f0c3535aa
commit 14ada96451
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/ci.scm
View file

@ -79,12 +79,9 @@
(define* (derivation->job name drv (define* (derivation->job name drv
#:key #:key
period
(max-silent-time 3600) (max-silent-time 3600)
(timeout 3600)) (timeout 3600))
"Return a Cuirass job called NAME and describing DRV. PERIOD is the minimal "Return a Cuirass job called NAME and describing DRV.
duration that must separate two evaluations of the same job. If PERIOD is
false, then the job will be evaluated as soon as possible.
MAX-SILENT-TIME and TIMEOUT are build options passed to the daemon when MAX-SILENT-TIME and TIMEOUT are build options passed to the daemon when
building the derivation." building the derivation."
@ -98,7 +95,6 @@ building the derivation."
(derivation->output-paths drv))) (derivation->output-paths drv)))
(#:nix-name . ,(derivation-name drv)) (#:nix-name . ,(derivation-name drv))
(#:system . ,(derivation-system drv)) (#:system . ,(derivation-system drv))
(#:period . ,period)
(#:max-silent-time . ,max-silent-time) (#:max-silent-time . ,max-silent-time)
(#:timeout . ,timeout))) (#:timeout . ,timeout)))
@ -237,14 +233,11 @@ SYSTEM."
(* 3600 hours)) (* 3600 hours))
(define (image-jobs store system) (define (image-jobs store system)
"Return a list of jobs that build images for SYSTEM. Those jobs are "Return a list of jobs that build images for SYSTEM."
expensive in storage and I/O operations, hence their periodicity is limited by
passing the PERIOD argument."
(define (->job name drv) (define (->job name drv)
(let ((name (string-append name "." system))) (let ((name (string-append name "." system)))
(parameterize ((%graft? #f)) (parameterize ((%graft? #f))
(derivation->job name drv (derivation->job name drv))))
#:period (hours 48)))))
(define (build-image image) (define (build-image image)
(run-with-store store (run-with-store store
@ -335,11 +328,7 @@ passing the PERIOD argument."
(set-guile-for-build (default-guile)) (set-guile-for-build (default-guile))
(system-test-value test))))) (system-test-value test)))))
;; Those tests are extremely expensive in I/O operations and storage (derivation->job name drv))))
;; size, use the "period" attribute to run them with a period of at
;; least 48 hours.
(derivation->job name drv
#:period (hours 24)))))
(if (member system %guix-system-supported-systems) (if (member system %guix-system-supported-systems)
;; Override the value of 'current-guix' used by system tests. Using a ;; Override the value of 'current-guix' used by system tests. Using a
@ -354,8 +343,7 @@ passing the PERIOD argument."
(define (->job name drv) (define (->job name drv)
(let ((name (string-append name "." system))) (let ((name (string-append name "." system)))
(parameterize ((%graft? #f)) (parameterize ((%graft? #f))
(derivation->job name drv (derivation->job name drv))))
#:period (hours 24)))))
;; XXX: Add a job for the stable Guix? ;; XXX: Add a job for the stable Guix?
(list (list