[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian: perform build2 in merged /usr environment for >= buster

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
d04769a7 by Simon McVittie at 2018-11-09T13:08:02Z
reproducible Debian: perform build2 in merged /usr environment for >= buster

- - - - -
7902f640 by Holger Levsen at 2018-11-09T13:08:02Z
reproducible Debian: document that we vary by installing the usrmerge package

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


2 changed files:

- bin/reproducible_build.sh
- bin/reproducible_common.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================
@@ -648,6 +648,14 @@ EOF
 	else
 		echo "BUILDDIR=/build" >> "$TMPCFG"
 	fi
+
+	local pbuilder_options=()
+	case "${SUITE}" in
+		(unstable|experimental|buster)
+			pbuilder_options+=(--extrapackages usrmerge)
+			;;
+	esac
+
 	set +e
 	# remember to change the sudoers setting if you change the following command
 	# (the 2nd build gets a longer timeout trying to make sure the first build
@@ -661,6 +669,7 @@ EOF
 			--basetgz /var/cache/pbuilder/$SUITE-reproducible-base.tgz \
 			--buildresult $TMPDIR/b2 \
 			--logfile b2/build.log \
+			"${pbuilder_options[@]}" \
 			${SRCPACKAGE}_${EVERSION}.dsc
 	local PRESULT=$?
 	set -e


=====================================
bin/reproducible_common.sh
=====================================
@@ -474,6 +474,7 @@ write_variation_table() {
 		write_page "<tr><td>uid</td><td>uid=1111</td><td>uid=2222</td></tr>"
 		write_page "<tr><td>gid</td><td>gid=1111</td><td>gid=2222</td></tr>"
 		write_page "<tr><td>/bin/sh</td><td>/bin/dash</td><td>/bin/bash</td></tr>"
+		write_page "<tr><td><em>usrmerge</em> package installed</td><td>no</td><td>yes</td></tr>"
 		write_page "<tr><td>build path</td><td>/build/1st/\$pkg-\$ver <em>(not varied for stretch/buster)</em></td><td>/build/\$pkg-\$ver/2nd <em>(not varied for stretch/buster)</em></td></tr>"
 		write_page "<tr><td>user's login shell</td><td>/bin/sh</td><td>/bin/bash</td></tr>"
 		write_page "<tr><td>user's <a href="https://en.wikipedia.org/wiki/Gecos_field">GECOS</a></td><td>first user,first room,first work-phone,first home-phone,first other</td><td>second user,second room,second work-phone,second home-phone,second other</td></tr>"



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/641cfb29f05e3024b3392a4e6dd3f3341f90df07...7902f640d98a55314c21808879b50a3a73d9de16

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/641cfb29f05e3024b3392a4e6dd3f3341f90df07...7902f640d98a55314c21808879b50a3a73d9de16
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20181109/443d995c/attachment-0001.html>