From 29db0e8eaa3efe5ad021ce5fdb7b39bd608f5d5f Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 15 Jun 2015 18:46:19 +0200 Subject: Revert "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" This reverts commit 0c7a58c92456e4d3c69c38424abf86cde5948a86. --- etc/sudoers.d/jenkins | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'etc') diff --git a/etc/sudoers.d/jenkins b/etc/sudoers.d/jenkins index c8803602..103841a6 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/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 *, \ + SETENV: NOPASSWD: /usr/sbin/pbuilder *, \ + SETENV: NOPASSWD: /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, \ -- cgit v1.2.3-70-g09d2