[Qa-jenkins-scm] [jenkins.debian.net] 02/02: reproducible: use disorderfs on every 2nd build

Holger Levsen holger at moszumanska.debian.org
Tue Sep 22 22:27:45 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 b2af898af134153bb1b6a9da96693a4092a896ca
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Sep 23 00:27:29 2015 +0200

    reproducible: use disorderfs on every 2nd build
---
 TODO                                                    |  3 +--
 .../etc/pbuilder/rebuild-hooks/B01_cleanup              |  2 ++
 .../etc/pbuilder/rebuild-hooks/C01_cleanup              |  2 ++
 .../etc/pbuilder/rebuild-hooks/D01_modify_environment   | 17 +++++++++++++++--
 .../etc/pbuilder/rebuild-hooks/B01_cleanup              |  2 ++
 .../etc/pbuilder/rebuild-hooks/C01_cleanup              |  2 ++
 .../etc/pbuilder/rebuild-hooks/D01_modify_environment   | 17 +++++++++++++++--
 .../hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup |  2 ++
 .../hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup |  2 ++
 .../etc/pbuilder/rebuild-hooks/D01_modify_environment   |  2 ++
 .../etc/pbuilder/rebuild-hooks/B01_cleanup              |  2 ++
 .../etc/pbuilder/rebuild-hooks/C01_cleanup              |  2 ++
 .../etc/pbuilder/rebuild-hooks/D01_modify_environment   | 17 +++++++++++++++--
 .../etc/pbuilder/rebuild-hooks/B01_cleanup              |  2 ++
 .../etc/pbuilder/rebuild-hooks/C01_cleanup              |  2 ++
 .../etc/pbuilder/rebuild-hooks/D01_modify_environment   | 17 +++++++++++++++--
 .../etc/pbuilder/rebuild-hooks/B01_cleanup              |  2 ++
 .../etc/pbuilder/rebuild-hooks/C01_cleanup              |  2 ++
 .../etc/pbuilder/rebuild-hooks/D01_modify_environment   | 17 +++++++++++++++--
 .../etc/pbuilder/rebuild-hooks/B01_cleanup              |  2 ++
 .../etc/pbuilder/rebuild-hooks/C01_cleanup              |  2 ++
 .../etc/pbuilder/rebuild-hooks/D01_modify_environment   | 17 +++++++++++++++--
 22 files changed, 121 insertions(+), 14 deletions(-)

diff --git a/TODO b/TODO
index 891aee9..eb39149 100644
--- a/TODO
+++ b/TODO
@@ -198,8 +198,7 @@ properties:
 ** link source-data-epoch spec from rb.d.n
 ** link howto on each coreboot/openwrt/netbsd/freebsd page
 ** pkg sets are still amd64 only atm…
-** use disorderfs:
-*** code is there, but scripts are only in hosts/jenkins/ and hosts/hb0/ and need to be copied to hosts/*/
+** disorderfs:
 *** document usage in diff table...
 
 * lesser prio
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
similarity index 84%
copy from hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
copy to hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
index 36a19bc..c60a991 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
+++ b/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
@@ -7,7 +7,9 @@ set -e
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
+	echo -n "Unmounting /tmp/disorderfs…"
 	fusermount -u /tmp/buildd
 	rmdir /tmp/buildd
 	mv /tmp/disorderfs /tmp/buildd
+	echo " done."
 fi
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
similarity index 84%
copy from hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
copy to hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
index 36a19bc..c60a991 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
+++ b/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
@@ -7,7 +7,9 @@ set -e
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
+	echo -n "Unmounting /tmp/disorderfs…"
 	fusermount -u /tmp/buildd
 	rmdir /tmp/buildd
 	mv /tmp/disorderfs /tmp/buildd
+	echo " done."
 fi
diff --git a/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index d955004..0697973 100755
--- a/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -2,11 +2,24 @@
 
 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
+	echo -n "Moving /tmp/buildd to /tmp/disorderfs and mounting this as /tmp/buildd via the fuse disorderfs…"
+	mknod -m 666 /dev/fuse c 10 229
+	mv /tmp/buildd /tmp/disorderfs
+	mkdir /tmp/buildd
+	disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
+	echo " done."
+else
+	echo "Warning: disorderfs not available."
+fi
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
similarity index 84%
copy from hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
copy to hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
index 36a19bc..c60a991 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
+++ b/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
@@ -7,7 +7,9 @@ set -e
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
+	echo -n "Unmounting /tmp/disorderfs…"
 	fusermount -u /tmp/buildd
 	rmdir /tmp/buildd
 	mv /tmp/disorderfs /tmp/buildd
+	echo " done."
 fi
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
similarity index 84%
copy from hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
copy to hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
index 36a19bc..c60a991 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
+++ b/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
@@ -7,7 +7,9 @@ set -e
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
+	echo -n "Unmounting /tmp/disorderfs…"
 	fusermount -u /tmp/buildd
 	rmdir /tmp/buildd
 	mv /tmp/disorderfs /tmp/buildd
+	echo " done."
 fi
diff --git a/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index d955004..0697973 100755
--- a/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -2,11 +2,24 @@
 
 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
+	echo -n "Moving /tmp/buildd to /tmp/disorderfs and mounting this as /tmp/buildd via the fuse disorderfs…"
+	mknod -m 666 /dev/fuse c 10 229
+	mv /tmp/buildd /tmp/disorderfs
+	mkdir /tmp/buildd
+	disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
+	echo " done."
+else
+	echo "Warning: disorderfs not available."
+fi
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
index 36a19bc..c60a991 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
+++ b/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
@@ -7,7 +7,9 @@ set -e
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
+	echo -n "Unmounting /tmp/disorderfs…"
 	fusermount -u /tmp/buildd
 	rmdir /tmp/buildd
 	mv /tmp/disorderfs /tmp/buildd
+	echo " done."
 fi
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
index 36a19bc..c60a991 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
+++ b/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
@@ -7,7 +7,9 @@ set -e
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
+	echo -n "Unmounting /tmp/disorderfs…"
 	fusermount -u /tmp/buildd
 	rmdir /tmp/buildd
 	mv /tmp/disorderfs /tmp/buildd
+	echo " done."
 fi
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 aed8d9a..0697973 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
@@ -14,10 +14,12 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
+	echo -n "Moving /tmp/buildd to /tmp/disorderfs and mounting this as /tmp/buildd via the fuse disorderfs…"
 	mknod -m 666 /dev/fuse c 10 229
 	mv /tmp/buildd /tmp/disorderfs
 	mkdir /tmp/buildd
 	disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
+	echo " done."
 else
 	echo "Warning: disorderfs not available."
 fi
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
similarity index 84%
copy from hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
copy to hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
index 36a19bc..c60a991 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
+++ b/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
@@ -7,7 +7,9 @@ set -e
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
+	echo -n "Unmounting /tmp/disorderfs…"
 	fusermount -u /tmp/buildd
 	rmdir /tmp/buildd
 	mv /tmp/disorderfs /tmp/buildd
+	echo " done."
 fi
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
similarity index 84%
copy from hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
copy to hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
index 36a19bc..c60a991 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
+++ b/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
@@ -7,7 +7,9 @@ set -e
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
+	echo -n "Unmounting /tmp/disorderfs…"
 	fusermount -u /tmp/buildd
 	rmdir /tmp/buildd
 	mv /tmp/disorderfs /tmp/buildd
+	echo " done."
 fi
diff --git a/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
index d955004..0697973 100755
--- a/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -2,11 +2,24 @@
 
 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
+	echo -n "Moving /tmp/buildd to /tmp/disorderfs and mounting this as /tmp/buildd via the fuse disorderfs…"
+	mknod -m 666 /dev/fuse c 10 229
+	mv /tmp/buildd /tmp/disorderfs
+	mkdir /tmp/buildd
+	disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
+	echo " done."
+else
+	echo "Warning: disorderfs not available."
+fi
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
similarity index 84%
copy from hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
copy to hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
index 36a19bc..c60a991 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
+++ b/hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
@@ -7,7 +7,9 @@ set -e
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
+	echo -n "Unmounting /tmp/disorderfs…"
 	fusermount -u /tmp/buildd
 	rmdir /tmp/buildd
 	mv /tmp/disorderfs /tmp/buildd
+	echo " done."
 fi
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
similarity index 84%
copy from hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
copy to hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
index 36a19bc..c60a991 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
+++ b/hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
@@ -7,7 +7,9 @@ set -e
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
+	echo -n "Unmounting /tmp/disorderfs…"
 	fusermount -u /tmp/buildd
 	rmdir /tmp/buildd
 	mv /tmp/disorderfs /tmp/buildd
+	echo " done."
 fi
diff --git a/hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
index d955004..0697973 100755
--- a/hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -2,11 +2,24 @@
 
 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
+	echo -n "Moving /tmp/buildd to /tmp/disorderfs and mounting this as /tmp/buildd via the fuse disorderfs…"
+	mknod -m 666 /dev/fuse c 10 229
+	mv /tmp/buildd /tmp/disorderfs
+	mkdir /tmp/buildd
+	disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
+	echo " done."
+else
+	echo "Warning: disorderfs not available."
+fi
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
similarity index 84%
copy from hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
copy to hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
index 36a19bc..c60a991 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
+++ b/hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
@@ -7,7 +7,9 @@ set -e
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
+	echo -n "Unmounting /tmp/disorderfs…"
 	fusermount -u /tmp/buildd
 	rmdir /tmp/buildd
 	mv /tmp/disorderfs /tmp/buildd
+	echo " done."
 fi
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
similarity index 84%
copy from hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
copy to hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
index 36a19bc..c60a991 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
+++ b/hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
@@ -7,7 +7,9 @@ set -e
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
+	echo -n "Unmounting /tmp/disorderfs…"
 	fusermount -u /tmp/buildd
 	rmdir /tmp/buildd
 	mv /tmp/disorderfs /tmp/buildd
+	echo " done."
 fi
diff --git a/hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
index d955004..0697973 100755
--- a/hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -2,11 +2,24 @@
 
 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
+	echo -n "Moving /tmp/buildd to /tmp/disorderfs and mounting this as /tmp/buildd via the fuse disorderfs…"
+	mknod -m 666 /dev/fuse c 10 229
+	mv /tmp/buildd /tmp/disorderfs
+	mkdir /tmp/buildd
+	disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
+	echo " done."
+else
+	echo "Warning: disorderfs not available."
+fi
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
similarity index 84%
copy from hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
copy to hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
index 36a19bc..c60a991 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
+++ b/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
@@ -7,7 +7,9 @@ set -e
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
+	echo -n "Unmounting /tmp/disorderfs…"
 	fusermount -u /tmp/buildd
 	rmdir /tmp/buildd
 	mv /tmp/disorderfs /tmp/buildd
+	echo " done."
 fi
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
similarity index 84%
copy from hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
copy to hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
index 36a19bc..c60a991 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
+++ b/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
@@ -7,7 +7,9 @@ set -e
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
+	echo -n "Unmounting /tmp/disorderfs…"
 	fusermount -u /tmp/buildd
 	rmdir /tmp/buildd
 	mv /tmp/disorderfs /tmp/buildd
+	echo " done."
 fi
diff --git a/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index d955004..0697973 100755
--- a/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -2,11 +2,24 @@
 
 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
+	echo -n "Moving /tmp/buildd to /tmp/disorderfs and mounting this as /tmp/buildd via the fuse disorderfs…"
+	mknod -m 666 /dev/fuse c 10 229
+	mv /tmp/buildd /tmp/disorderfs
+	mkdir /tmp/buildd
+	disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
+	echo " done."
+else
+	echo "Warning: disorderfs not available."
+fi

-- 
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