From 897e5d9960bf9e78767415a619a2eb4ad05667c4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 15 May 2015 15:31:20 +0200 Subject: hydra: Increase USB image size. * build-aux/hydra/gnu-system.scm (qemu-jobs): Increase disk image size to 860 MiB, for x86_64. --- build-aux/hydra/gnu-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build-aux/hydra/gnu-system.scm') diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index c612ff1f12..8d9b43c0b0 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -159,7 +159,7 @@ system.") (set-guile-for-build (default-guile)) (system-disk-image installation-os #:disk-image-size - (* 850 MiB)))))) + (* 860 MiB)))))) '())) (define (tarball-jobs store system) -- cgit 1.4.1 From ae0bcc1e9d43fe961224ef564a36d2ec564271b6 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 28 May 2015 22:50:19 -0400 Subject: 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. --- build-aux/hydra/gnu-system.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'build-aux/hydra/gnu-system.scm') 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." -- cgit 1.4.1