summaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-05-28 22:50:19 -0400
committerMark H Weaver <mhw@netris.org>2015-05-29 14:33:32 -0400
commitae0bcc1e9d43fe961224ef564a36d2ec564271b6 (patch)
tree0bb2f555fff9e7793086874ddded47dd95261bfc /build-aux
parent307153c1ef16132fffebe96cc67ad662e37006a4 (diff)
hydra: Support per-package absolute build timeouts.
* build-aux/hydra/gnu-system.scm (package->alist): Use the 'timeout' value in the package 'properties' alist, if present.
Diffstat (limited to 'build-aux')
-rw-r--r--build-aux/hydra/gnu-system.scm6
1 files changed, 2 insertions, 4 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index 8d9b43c0b0..83cc6fb177 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -78,10 +78,8 @@
(license . ,(package-license package))
(home-page . ,(package-home-page package))
(maintainers . ("bug-guix@gnu.org"))
-
- ;; Work around versions of 'hydra-eval-guile-jobs' before Hydra commit
- ;; 61448ca (27 Feb. 2014) which used a default timeout of 2h.
- (timeout . 72000)))
+ (timeout . ,(or (assoc-ref (package-properties package) 'timeout)
+ 72000)))) ; 20 hours by default
(define (package-job store job-name package system)
"Return a job called JOB-NAME that builds PACKAGE on SYSTEM."