diff options
| author | Holger Levsen <holger@layer-acht.org> | 2014-10-05 02:26:06 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-10-05 02:26:06 +0200 |
| commit | e4bb3bbfdd68aa39e8819f401b25aae744ba180c (patch) | |
| tree | c0e6f6c732474807a24325cbcfc4cdb2b1b782cc | |
| parent | e63787d11d171df98781c0384d7bf57a8415af19 (diff) | |
| download | jenkins.debian.net-e4bb3bbfdd68aa39e8819f401b25aae744ba180c.tar.xz | |
reproducible: pbuilder setup: replace existing base.tgz only when a new one can be created
| -rwxr-xr-x | bin/reproducible_setup.sh | 7 | ||||
| -rw-r--r-- | etc/sudoers.d/jenkins | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/reproducible_setup.sh b/bin/reproducible_setup.sh index 845a516b..f36442ac 100755 --- a/bin/reproducible_setup.sh +++ b/bin/reproducible_setup.sh @@ -99,8 +99,7 @@ EOF # # actually setup pbuilder # -sudo rm /var/cache/pbuilder/base-reproducible.tgz || true -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 -- ${TMPFILE} +sudo pbuilder --create --basetgz /var/cache/pbuilder/base-reproducible-new.tgz --distribution sid +sudo pbuilder --execute --save-after-exec --basetgz /var/cache/pbuilder/base-reproducible-new.tgz -- ${TMPFILE} +sudo mv pbuilder/base-reproducible-new.tgz /var/cache/pbuilder/base-reproducible.tgz rm ${TMPFILE} - diff --git a/etc/sudoers.d/jenkins b/etc/sudoers.d/jenkins index be538c2d..acb0d142 100644 --- a/etc/sudoers.d/jenkins +++ b/etc/sudoers.d/jenkins @@ -27,6 +27,7 @@ jenkins ALL= \ /bin/cp -r /media/*, \ /bin/chown -R jenkins\:jenkins /var/lib/jenkins/jobs/*,\ SETENV: NOPASSWD: /usr/sbin/pbuilder *, \ + /bin/mv pbuilder/base-reproducible-new.tgz /var/cache/pbuilder/base-reproducible.tgz, \ /bin/rm /var/cache/pbuilder/base*.tgz, \ /bin/rm /var/cache/pbuilder/result/*, \ /usr/bin/dcmd rm *.changes, \ |