summaryrefslogtreecommitdiff
path: root/gnu/ci.scm
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2021-04-08 14:03:50 +0200
committerMathieu Othacehe <othacehe@gnu.org>2021-04-08 15:24:03 +0200
commit14ada96451812d1ccb7d42e3f0ec2a9248273f0e (patch)
tree81cf6ae52f9d54843005b80e81cb24cea8546839 /gnu/ci.scm
parent5f0c3535aa8394a675edcba11a8aff330cd49a61 (diff)
ci: Remove the job period argument.
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.
Diffstat (limited to 'gnu/ci.scm')
-rw-r--r--gnu/ci.scm22
1 files changed, 5 insertions, 17 deletions
diff --git a/gnu/ci.scm b/gnu/ci.scm
index 32b7a611fb0..4095d4e5132 100644
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@ -79,12 +79,9 @@
79 79
80(define* (derivation->job name drv 80(define* (derivation->job name drv
81 #:key 81 #:key
82 period
83 (max-silent-time 3600) 82 (max-silent-time 3600)
84 (timeout 3600)) 83 (timeout 3600))
85 "Return a Cuirass job called NAME and describing DRV. PERIOD is the minimal 84 "Return a Cuirass job called NAME and describing DRV.
86duration that must separate two evaluations of the same job. If PERIOD is
87false, then the job will be evaluated as soon as possible.
88 85
89MAX-SILENT-TIME and TIMEOUT are build options passed to the daemon when 86MAX-SILENT-TIME and TIMEOUT are build options passed to the daemon when
90building the derivation." 87building the derivation."
@@ -98,7 +95,6 @@ building the derivation."
98 (derivation->output-paths drv))) 95 (derivation->output-paths drv)))
99 (#:nix-name . ,(derivation-name drv)) 96 (#:nix-name . ,(derivation-name drv))
100 (#:system . ,(derivation-system drv)) 97 (#:system . ,(derivation-system drv))
101 (#:period . ,period)
102 (#:max-silent-time . ,max-silent-time) 98 (#:max-silent-time . ,max-silent-time)
103 (#:timeout . ,timeout))) 99 (#:timeout . ,timeout)))
104 100
@@ -237,14 +233,11 @@ SYSTEM."
237 (* 3600 hours)) 233 (* 3600 hours))
238 234
239(define (image-jobs store system) 235(define (image-jobs store system)
240 "Return a list of jobs that build images for SYSTEM. Those jobs are 236 "Return a list of jobs that build images for SYSTEM."
241expensive in storage and I/O operations, hence their periodicity is limited by
242passing the PERIOD argument."
243 (define (->job name drv) 237 (define (->job name drv)
244 (let ((name (string-append name "." system))) 238 (let ((name (string-append name "." system)))
245 (parameterize ((%graft? #f)) 239 (parameterize ((%graft? #f))
246 (derivation->job name drv 240 (derivation->job name drv))))
247 #:period (hours 48)))))
248 241
249 (define (build-image image) 242 (define (build-image image)
250 (run-with-store store 243 (run-with-store store
@@ -335,11 +328,7 @@ passing the PERIOD argument."
335 (set-guile-for-build (default-guile)) 328 (set-guile-for-build (default-guile))
336 (system-test-value test))))) 329 (system-test-value test)))))
337 330
338 ;; Those tests are extremely expensive in I/O operations and storage 331 (derivation->job name drv))))
339 ;; size, use the "period" attribute to run them with a period of at
340 ;; least 48 hours.
341 (derivation->job name drv
342 #:period (hours 24)))))
343 332
344 (if (member system %guix-system-supported-systems) 333 (if (member system %guix-system-supported-systems)
345 ;; Override the value of 'current-guix' used by system tests. Using a 334 ;; Override the value of 'current-guix' used by system tests. Using a
@@ -354,8 +343,7 @@ passing the PERIOD argument."
354 (define (->job name drv) 343 (define (->job name drv)
355 (let ((name (string-append name "." system))) 344 (let ((name (string-append name "." system)))
356 (parameterize ((%graft? #f)) 345 (parameterize ((%graft? #f))
357 (derivation->job name drv 346 (derivation->job name drv))))
358 #:period (hours 24)))))
359 347
360 ;; XXX: Add a job for the stable Guix? 348 ;; XXX: Add a job for the stable Guix?
361 (list 349 (list