summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2015-06-15 18:29:31 +0200
committerHolger Levsen <holger@layer-acht.org>2015-06-16 00:44:41 +0200
commit52d302e6d06f251a8a0efed46fb2896f468342d3 (patch)
tree17f2403d43b9d59dda5d9766963335464eb36c80 /etc
parent29db0e8eaa3efe5ad021ce5fdb7b39bd608f5d5f (diff)
downloadjenkins.debian.net-52d302e6d06f251a8a0efed46fb2896f468342d3.tar.xz
reproducible: build: call timeout with sudo, and not the reverse, as a user-called timeout can't kill a root process + give pbuilder 6 minutes to exit after SIGTERM before SIGKILL
Diffstat (limited to 'etc')
-rw-r--r--etc/sudoers.d/jenkins4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/sudoers.d/jenkins b/etc/sudoers.d/jenkins
index 103841a6..c8803602 100644
--- a/etc/sudoers.d/jenkins
+++ b/etc/sudoers.d/jenkins
@@ -29,8 +29,8 @@ jenkins ALL= \
/usr/bin/guestmount *, \
/bin/cp -rv /media/*, \
/bin/chown -R jenkins\:jenkins /var/lib/jenkins/jobs/*,\
- SETENV: NOPASSWD: /usr/sbin/pbuilder *, \
- SETENV: NOPASSWD: /usr/bin/linux64 --uname-2.6 /usr/bin/unshare --uts -- /usr/sbin/pbuilder *, \
+ SETENV: NOPASSWD: /usr/bin/timeout -k 12.1h 12h /usr/bin/ionice -c 3 nice /usr/sbin/pbuilder *, \
+ SETENV: NOPASSWD: /usr/bin/timeout -k 12.1h 12h /usr/bin/ionice -c 3 nice /usr/bin/linux64 --uname-2.6 /usr/bin/unshare --uts -- /usr/sbin/pbuilder *, \
/bin/mv /var/cache/pbuilder/*base*.tgz /var/cache/pbuilder/*base*.tgz, \
/bin/rm /var/cache/pbuilder/*base*.tgz, \
/bin/rm -v /var/cache/pbuilder/*base*.tgz, \