[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible freebsd: fixup remote tar'ing

Holger Levsen holger at moszumanska.debian.org
Wed Aug 26 11:10:39 UTC 2015


This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit d038a763e71b1782daef3811bfe8e4fdcfcb1657
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Aug 26 13:10:21 2015 +0200

    reproducible freebsd: fixup remote tar'ing
---
 bin/reproducible_freebsd.sh                 | 4 ++--
 hosts/freebsd-jenkins/usr/local/etc/sudoers | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_freebsd.sh b/bin/reproducible_freebsd.sh
index 566df33..da3009c 100755
--- a/bin/reproducible_freebsd.sh
+++ b/bin/reproducible_freebsd.sh
@@ -27,8 +27,8 @@ save_freebsd_results(){
 	local RUN=$1
 	mkdir -p $TMPDIR/$RUN/
 	# copy results over
-	DUMMY_DATE="$(date -u +'%Y-%m-%d') 00:00Z"
-	$RSSH "sudo find $TMPDIR --exec touch --date='$DUMMY_DATE' \{\} \;"
+	DUMMY_DATE="$(date -u +'%Y-%m-%d')T00:00:00Z"
+	$RSSH "sudo find $TMPDIR -newer $TMPDIR -exec touch -d '$DUMMY_DATE' {} \;"
 	$RSSH "sudo find $TMPDIR -print0 | LC_ALL=C sort -z | sudo tar --null -T - --no-recursion -cJf $TMPDIR.tar.xz"
 	$RSCP:$TMPDIR.tar.xz $TMPDIR/$RUN
 	$RSSH "sudo rm -r $TMPDIR $TMPDIR.tar.xz ; mkdir $TMPDIR"
diff --git a/hosts/freebsd-jenkins/usr/local/etc/sudoers b/hosts/freebsd-jenkins/usr/local/etc/sudoers
index 348d4cb..ca84d41 100644
--- a/hosts/freebsd-jenkins/usr/local/etc/sudoers
+++ b/hosts/freebsd-jenkins/usr/local/etc/sudoers
@@ -103,7 +103,7 @@ jenkins ALL= NOPASSWD: /usr/bin/make -j ? buildworld, \
 	/bin/mkdir /usr/obj, \
 	/bin/mkdir /usr/src /usr/obj, \
 	/usr/sbin/chown jenkins /usr/src /usr/obj, \
-	/usr/bin/find /srv/reproducible-results/* --exec touch *, \
+	/usr/bin/find /srv/reproducible-results/* -newer /srv/reproducible-results/* -exec touch *, \
 	/usr/bin/find /srv/reproducible-results/* -print0, \
 	/usr/bin/tar --null -T - --no-recursion -cJf *.tar.xz
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git



More information about the Qa-jenkins-scm mailing list