[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-94-g72ae6d0

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 72ae6d0c2170986109189a9814a392d6e6222cdd
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Feb 23 18:30:29 2013 +0100

    p.conf: use /usr/bin/timeout to ensure piuparts termination
    
    timeout -s INT -k 5m 35m
    
    -s INT    send SIGINT after runtime was exceeded
    -k 5m     send SIGKILL 5 minutes later
    35m       set limit to 35 minutes
    
    (piuparts-slave has a hardcoded limit of 45 minutes)
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
index 9903adf..b7d6c16 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.goldwasser
@@ -18,6 +18,7 @@ master-user = piupartsm
 bts-from = piuparts-devel at lists.alioth.debian.org
 piuparts-command =
 	sudo
+	timeout -s INT -k 5m 35m
 	/org/piuparts.debian.org/sbin/piuparts
 	--skip-logrotatefiles-test
 	--warn-on-others
diff --git a/instances/piuparts.conf.piatti b/instances/piuparts.conf.piatti
index 773fe6c..dae7c8e 100644
--- a/instances/piuparts.conf.piatti
+++ b/instances/piuparts.conf.piatti
@@ -20,6 +20,7 @@ master-user = piupartsm
 bts-from = piuparts-devel at lists.alioth.debian.org
 piuparts-command =
 	sudo
+	timeout -s INT -k 5m 35m
 	/org/piuparts.debian.org/sbin/piuparts
 	--skip-logrotatefiles-test
 	--warn-on-others

-- 
piuparts git repository