From 6f3051d540fb1e2243a865bc0324a2ab25150b32 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 23 Sep 2014 23:34:53 +0200 Subject: reproducible: minor fixes --- bin/reproducible_setup.sh | 1 + etc/sudoers.d/jenkins | 3 +-- job-cfg/reproducible.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/reproducible_setup.sh b/bin/reproducible_setup.sh index 8f5348e1..3cd89485 100755 --- a/bin/reproducible_setup.sh +++ b/bin/reproducible_setup.sh @@ -14,6 +14,7 @@ echo "Warning: Usage of --force-yes to override the apt authentication warning. apt-get install --force-yes -y dpkg dpkg-dev debhelper dh-python discount EOF +sudo rm /var/cache/pbuilder/base-reproducible.tgz sudo pbuilder --create --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution sid sudo pbuilder --execute --save-after-exec --basetgz /var/cache/pbuilder/base-reproducible.tgz -- rm $TMPFILE diff --git a/etc/sudoers.d/jenkins b/etc/sudoers.d/jenkins index 1e1ada9b..a181730c 100644 --- a/etc/sudoers.d/jenkins +++ b/etc/sudoers.d/jenkins @@ -27,8 +27,7 @@ jenkins ALL= \ /bin/cp -r /media/*, \ /bin/chown -R jenkins\:jenkins /var/lib/jenkins/jobs/*,\ SETENV: NOPASSWD: /usr/sbin/pbuilder *, \ - /bin/rm /var/cache/pbuilder/base.tgz, \ - /bin/cp /var/cache/pbuilder/base.tgz /var/cache/pbuilder/base-reproducible.tgz, \ + /bin/rm /var/cache/pbuilder/base*.tgz, \ /usr/bin/dcmd rm *.changes # keep these environment variables diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index 15dd4faa..645afbde 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -7,7 +7,7 @@ text: About jenkins.debian.net icon: /userContent/images/debian-swirl-24x24.png - sidebar: - url: https://jenkins.debian.net/view/dvswitch/ + url: https://jenkins.debian.net/view/reproducible text: dvswitch test jobs icon: /userContent/images/debian-jenkins-24x24.png - sidebar: -- cgit v1.2.3-70-g09d2