[Git][qa/jenkins.debian.net][master] reproducible Debian: correctly document that we are not variying usrmerge (see...

[Holger Levsen (@holger)]

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


Commits:
746ca36e by Holger Levsen at 2023-08-29T11:12:29+02:00
reproducible Debian: correctly document that we are not variying usrmerge (see below for explaination)

because:

- Debian is still not using usrmerge on buildds
- this is a noop-change for r-b
- I'd like the jenkins hosts not to reach unworking load levels. This seems to
  diffoscope related/caused, so I'm trying to reduce variations to get
  diffoscope not to act up and kill the host almost daily

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

- - - - -


4 changed files:

- TODO.trixie
- bin/reproducible_build.sh
- bin/reproducible_common.sh
- hosts/common/etc/pbuilder/rebuild-hooks/A99_set_merged_usr


Changes:

=====================================
TODO.trixie
=====================================
@@ -5,7 +5,7 @@
 
 * things still to be done after the bookworm release and as trixie is open for development
 ** once these items have been done, move them down to "already done"
-* update reproducible_common.sh with regards to the usrmerge variation in certain suites
+* usrmerge (variation) is disabled everywhere, including on Debian buildds
 * rename this file to TODO.forky
 * enjoy
 


=====================================
bin/reproducible_build.sh
=====================================
@@ -750,7 +750,7 @@ EOF
 
 	local pbuilder_options=()
 	#case "${SUITE}" in
-	#	buster|bullseye)	;;
+	#	buster|bullseye|bookworm)	;;
 	#	*)			pbuilder_options+=(--extrapackages usrmerge)
 	#				;;
 	#esac


=====================================
bin/reproducible_common.sh
=====================================
@@ -535,7 +535,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><a href=\"https://wiki.debian.org/UsrMerge\">usrmerge</a></em> package installed</td><td>no</td><td>yes <em>(not varied for buster/bullseye)</em></td></tr>"
+		write_page "<tr><td><em><a href=\"https://wiki.debian.org/UsrMerge\">usrmerge</a></em> package installed</td><td colspan=\"2\2>not not varied currently</em></td></tr>"
 		write_page "<tr><td>build path</td><td colspan=\"2\">/build/reproducible-path/\$pkg-\$ver <em>(not varied anymore)</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>"


=====================================
hosts/common/etc/pbuilder/rebuild-hooks/A99_set_merged_usr
=====================================
@@ -4,7 +4,7 @@
 
 set -eu
 
-# if [ "$DISTRIBUTION" != stretch ] && [ "$DISTRIBUTION" != buster ] && [ "$DISTRIBUTION" != bullseye ]; then
+# if [ "$DISTRIBUTION" != buster ] && [ "$DISTRIBUTION" != bullseye ] && [ "$DISTRIBUTION" != trixie ]; then
 #     echo "Re-configuring usrmerge..."
 
 #     rm -fv /etc/unsupported-skip-usrmerge-conversion



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/746ca36e48e3c0955a24734cb6f42cf6c2b9359a

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/746ca36e48e3c0955a24734cb6f42cf6c2b9359a
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/20230829/e3b8eb97/attachment-0001.htm>