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