[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: Revert "Revert "reproducible Archlinux: fixup: temporarily disable building as…

[Holger Levsen]

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


Commits:
d42cb0da by Holger Levsen at 2018-10-12T20:41:19Z
Revert "Revert "reproducible Archlinux: fixup: temporarily disable building as build2 and build as jenkins user (to see if this fixes those path variations we now see in almost all archlinux builds)"""

This reverts commit cb1acb99452f15fb1d8c902eb9a670e3b0c24098.

- - - - -
8d2d1b29 by Holger Levsen at 2018-10-12T20:48:51Z
reproducible Archlinux: set PATH to /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' because that's what makechrootpkg is using

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

- - - - -


2 changed files:

- bin/reproducible_build_archlinux_pkg.sh
- bin/reproducible_common.sh


Changes:

=====================================
bin/reproducible_build_archlinux_pkg.sh
=====================================
@@ -122,7 +122,7 @@ first_build() {
 	local BUILDDIR="/tmp/$SRCPACKAGE-$(basename $TMPDIR)"
 	local LOG=$TMPDIR/b1/$SRCPACKAGE/build1.log
 	local FUTURE_STATE="disabled"
-	local MAKEPKG_ENV_VARS="SOURCE_DATE_EPOCH='$SOURCE_DATE_EPOCH'"
+	local MAKEPKG_ENV_VARS="SOURCE_DATE_EPOCH='$SOURCE_DATE_EPOCH' PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'"
 	local MAKEPKG_OPTIONS="--syncdeps --noconfirm"
 	if [ "$(hostname -f)" = "profitbricks-build4-amd64" ] ; then
 		FUTURE_STATE="enabled"
@@ -203,7 +203,7 @@ second_build() {
 	local LOG=$TMPDIR/b2/$SRCPACKAGE/build2.log
 	NEW_NUM_CPU=$(echo $NUM_CPU-1|bc)
 	local FUTURE_STATE="disabled"
-	local MAKEPKG_ENV_VARS="SOURCE_DATE_EPOCH='$SOURCE_DATE_EPOCH'"
+	local MAKEPKG_ENV_VARS="SOURCE_DATE_EPOCH='$SOURCE_DATE_EPOCH' PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'"
 	local MAKEPKG_OPTIONS="--syncdeps --noconfirm"
 	if [ "$(hostname -f)" = "profitbricks-build4-amd64" ] ; then
 		FUTURE_STATE="enabled"
@@ -228,11 +228,6 @@ second_build() {
 	export LC_ALL="fr_CH.UTF-8"
 	umask 0002
 	__END__
-	# create 'build2' group and user, chown $BUILDIR to them and allow build2 to run pacman as root
-	schroot --run-session -c $SESSION --directory "$BUILDDIR" -u root -- groupadd build2
-	schroot --run-session -c $SESSION --directory "$BUILDDIR" -u root -- useradd -g build2 build2
-	schroot --run-session -c $SESSION --directory "$BUILDDIR" -u root -- chown -R build2:build2 "$BUILDDIR"
-	echo 'build2 ALL= NOPASSWD: /usr/sbin/pacman *' | schroot --run-session -c $SESSION --directory "$BUILDDIR" -u root -- tee -a /etc/sudoers
 	# some more output for debugging
 	set -x
 	# remove possible lock in our local session (happens when root maintenance update running while session starts)
@@ -250,7 +245,7 @@ second_build() {
 	schroot --run-session -c $SESSION --directory "$BUILDDIR/$ACTUAL_SRCPACKAGE/trunk" -u root -- su -c "bash -l -c '$MAKEPKG_ENV_VARS printenv 2>&1'" build2 | tee -a $LOG
 	# nicely run makepkg with a timeout of $TIMEOUT hours
 	timeout -k $TIMEOUT.1h ${TIMEOUT}h /usr/bin/ionice -c 3 /usr/bin/nice \
-		schroot --run-session -c $SESSION --directory "$BUILDDIR/$ACTUAL_SRCPACKAGE/trunk" -u root -- su -c "bash -l -c '$MAKEPKG_ENV_VARS makepkg $MAKEPKG_OPTIONS 2>&1'" build2 | tee -a $LOG
+		schroot --run-session -c $SESSION --directory "$BUILDDIR/$ACTUAL_SRCPACKAGE/trunk" -- bash -l -c "$MAKEPKG_ENV_VARS makepkg $MAKEPKG_OPTIONS 2>&1" | tee -a $LOG
 	PRESULT=${PIPESTATUS[0]}
 	if [ $PRESULT -eq 124 ] ; then
 		echo "$(date -u) - makepkg was killed by timeout after ${TIMEOUT}h." | tee -a $LOG


=====================================
bin/reproducible_common.sh
=====================================
@@ -460,6 +460,8 @@ write_variation_table() {
 	fi
 	if [ "$1" != "FreeBSD" ] && [ "$1" != "Arch Linux" ]  ; then
 		write_page "<tr><td>env PATH</td><td>PATH=\"/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:\"</td><td>PATH=\"/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path\"</td></tr>"
+	elif [ "$1" = "Arch Linux" ]  ; then
+		write_page "<tr><td>env PATH</td><td colspan=\"2\">is set to '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' because that's what <i>makechrootpkg</i> is using</td>"
 	else
 		write_page "<tr><td>env PATH</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>"
 	fi



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/004ab3c35f07efc3c1409fc995e794b4fcd7442c...8d2d1b298f027cbd42e89b85a0a5b1882bee4e71

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/004ab3c35f07efc3c1409fc995e794b4fcd7442c...8d2d1b298f027cbd42e89b85a0a5b1882bee4e71
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/20181012/a6a104bf/attachment-0001.html>