summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2012-11-10 02:14:44 +0100
committerHolger Levsen <holger@layer-acht.org>2012-11-10 02:14:44 +0100
commit8f2ec27cf565fb60eb0bc427c9169ef874f84e30 (patch)
tree292eb513895bf5dd784f5da752b86bde40aa5203
parentde2560b32f169e442ba6935b2e49414cedabcb39 (diff)
downloadjenkins.debian.net-8f2ec27cf565fb60eb0bc427c9169ef874f84e30.tar.xz
fixup manual build
-rwxr-xr-xbin/d-i_manual.sh7
-rwxr-xr-xetc/sudoers.d/jenkins2
2 files changed, 3 insertions, 6 deletions
diff --git a/bin/d-i_manual.sh b/bin/d-i_manual.sh
index e61f9774..33b76c00 100755
--- a/bin/d-i_manual.sh
+++ b/bin/d-i_manual.sh
@@ -17,8 +17,6 @@ rm -fv *.deb *.dsc *_*.build *_*.changes *_*.tar.gz
#
# prepare build
#
-cd manual
-pdebuild
if [ -f /var/base.tgz ] ; then
sudo pbuilder --create
else
@@ -28,6 +26,5 @@ fi
#
# build
#
-cd ..
-sudo pbuilder --build *dsc
-
+cd manual
+pdebuild
diff --git a/etc/sudoers.d/jenkins b/etc/sudoers.d/jenkins
index 39d15131..584284b3 100755
--- a/etc/sudoers.d/jenkins
+++ b/etc/sudoers.d/jenkins
@@ -1,4 +1,4 @@
-jenkins ALL= NOPASSWD: /usr/sbin/debootstrap *, NOPASSWD: /usr/sbin/chroot /chroots/*, NOPASSWD: /bin/rm -rf /chroots/*, NOPASSWD: /bin/umount -l /chroots/*, NOPASSWD: /usr/bin/du *, NOPASSWD: /usr/sbin/pbuilder *
+jenkins ALL= NOPASSWD: /usr/sbin/debootstrap *, NOPASSWD: /usr/sbin/chroot /chroots/*, NOPASSWD: /bin/rm -rf /chroots/*, NOPASSWD: /bin/umount -l /chroots/*, NOPASSWD: /usr/bin/du *, SETENV: NOPASSWD: /usr/sbin/pbuilder *
# keep these environment variables
Defaults env_keep += "http_proxy", env_reset