diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-08-26 13:10:21 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-08-26 13:10:21 +0200 |
| commit | d038a763e71b1782daef3811bfe8e4fdcfcb1657 (patch) | |
| tree | 9d9bee97dd3e46e6953d3fb908eec203dc7b8ccb | |
| parent | d478c4efa6a00801cf1634149cc6ea4d0294061b (diff) | |
| download | jenkins.debian.net-d038a763e71b1782daef3811bfe8e4fdcfcb1657.tar.xz | |
reproducible freebsd: fixup remote tar'ing
| -rwxr-xr-x | bin/reproducible_freebsd.sh | 4 | ||||
| -rw-r--r-- | 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 566df332..da3009c7 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 348d4cb5..ca84d418 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 |