summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-12-25 14:05:27 +0100
committerHolger Levsen <holger@layer-acht.org>2014-12-25 14:05:27 +0100
commit876d1d82cd0eb4f589e2661765ebec98becadde7 (patch)
tree9a46bfa39276571df64b94520327e73f41f2e246
parente44cc629d1929b996ed1f62fde134f91f7030c0a (diff)
downloadjenkins.debian.net-876d1d82cd0eb4f589e2661765ebec98becadde7.tar.xz
use Build-timeout Plugin to limit job runtime to 6h for chroot-installations and g-i-installation jobs and to 26h for reproducible_builder jobs
-rw-r--r--INSTALL1
-rwxr-xr-xjob-cfg/chroot-installation.yaml.py3
-rw-r--r--job-cfg/g-i-installation.yaml2
-rw-r--r--job-cfg/reproducible.yaml3
4 files changed, 9 insertions, 0 deletions
diff --git a/INSTALL b/INSTALL
index 8b77738c..838fd475 100644
--- a/INSTALL
+++ b/INSTALL
@@ -44,6 +44,7 @@ I would prefer to run a jenkins package from wheezy-backports.
* Priority Sorter Plugin
* Throttle Concurrent Builds Plugin
* Next Executions Plugin
+* Build-timeout Plugin
* Build Token Root Plugin
* Embeddable Build Status Plugin
* Plot Plugin
diff --git a/job-cfg/chroot-installation.yaml.py b/job-cfg/chroot-installation.yaml.py
index c8242154..4fa2b183 100755
--- a/job-cfg/chroot-installation.yaml.py
+++ b/job-cfg/chroot-installation.yaml.py
@@ -191,6 +191,9 @@ print("""
option: category
categories:
- chroot-installation
+ wrappers:
+ - timeout:
+ timeout: 360
""")
for base_distro in sorted(base_distros):
diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml
index d6295bb3..5f246e68 100644
--- a/job-cfg/g-i-installation.yaml
+++ b/job-cfg/g-i-installation.yaml
@@ -32,6 +32,8 @@
image-width: 300
wrappers:
- live-screenshot
+ - timeout:
+ timeout: 360
properties:
- sidebar:
url: https://jenkins.debian.net/userContent/about.html
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 8a4739d0..125177b9 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -100,6 +100,9 @@
categories:
- reproducible
description: '{my_description}<br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/tree/job-cfg/reproducible.yaml">reproducible.yaml</a>.<br>Results are available at <a href="https://reproducible.debian.net/">https://reproducible.debian.net</a>.'
+ wrappers:
+ - timeout:
+ timeout: 1560
logrotate:
daysToKeep: 14
numToKeep: 750