[Qa-jenkins-scm] [jenkins.debian.net] 03/03: reproducible: enable disorderfs on hb0

[Holger Levsen]

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 32a4d96abb1edabb2dad190b207748cd0e961ee1
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Sep 22 22:59:45 2015 +0200

    reproducible: enable disorderfs on hb0
---
 TODO                                                      |  3 +--
 .../etc/pbuilder/rebuild-hooks/D01_modify_environment     | 15 +++++++++++++--
 .../etc/pbuilder/rebuild-hooks/D01_modify_environment     |  1 -
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/TODO b/TODO
index cb12d96..891aee9 100644
--- a/TODO
+++ b/TODO
@@ -199,8 +199,7 @@ properties:
 ** link howto on each coreboot/openwrt/netbsd/freebsd page
 ** pkg sets are still amd64 only atm…
 ** use disorderfs:
-*** code is there but disabled, but scripts are only in hosts/jenkins/ and need to be copied to hosts/*/
-*** needs disorderfs 0.3.0-1 to be in testing first… (or uploaded to our repo)
+*** code is there, but scripts are only in hosts/jenkins/ and hosts/hb0/ and need to be copied to hosts/*/
 *** document usage in diff table...
 
 * lesser prio
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index d955004..aed8d9a 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -2,11 +2,22 @@
 
 set -e
 
-# exit if we are in the same UTS namespace than init
+# exit if we are in the same UTS namespace as init ( != 2nd build )
 [ "$(readlink /proc/1/ns/uts)" = "$(readlink /proc/self/ns/uts)" ] && exit 0
 
-echo "I: Changing hostname to test build reproducibility" >&2
+echo "I: Changing host+domainname to test build reproducibility" >&2
 sed -e '/^127.0.0.1/s/$/ i-capture-the-hostname i-capture-the-hostname.i-capture-the-domain/' -i /etc/hosts
 hostname i-capture-the-hostname
 domainname i-capture-the-domain
+echo "I: Adding a custom variable just for the fun of it..." >&2
 export CAPTURE_ENVIRONMENT="I capture the environment"
+
+# use disorderfs
+if [ -x /usr/bin/disorderfs ] ; then
+	mknod -m 666 /dev/fuse c 10 229
+	mv /tmp/buildd /tmp/disorderfs
+	mkdir /tmp/buildd
+	disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
+else
+	echo "Warning: disorderfs not available."
+fi
diff --git a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 9d0d440..aed8d9a 100755
--- a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -13,7 +13,6 @@ echo "I: Adding a custom variable just for the fun of it..." >&2
 export CAPTURE_ENVIRONMENT="I capture the environment"
 
 # use disorderfs
-exit 0 # currently disabled
 if [ -x /usr/bin/disorderfs ] ; then
 	mknod -m 666 /dev/fuse c 10 229
 	mv /tmp/buildd /tmp/disorderfs

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