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

[Holger Levsen]

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


Commits:
cb1acb99 by Holger Levsen at 2018-10-11T18:04:35Z
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 e76b96c6112f688341b9567b027a816677a804ce.

- - - - -
bed37f55 by Holger Levsen at 2018-10-11T18:09:43Z
reproducible Archlinux: printenv before the builds to debug different pathes issue

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

- - - - -


1 changed file:

- bin/reproducible_build_archlinux_pkg.sh


Changes:

=====================================
bin/reproducible_build_archlinux_pkg.sh
=====================================
@@ -156,6 +156,8 @@ first_build() {
 	fi
 	VERSION="$epoch$pkgver-$pkgrel"
 	echo $VERSION > $TMPDIR/b1/$SRCPACKAGE/build1.version
+	# show env variables
+	schroot --run-session -c $SESSION --directory "$BUILDDIR/$ACTUAL_SRCPACKAGE/trunk" -- bash -l -c "$MAKEPKG_ENV_VARS printenv 2>&1" | 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" -- bash -l -c "$MAKEPKG_ENV_VARS makepkg $MAKEPKG_OPTIONS 2>&1" | tee -a $LOG
@@ -226,6 +228,11 @@ 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)
@@ -239,9 +246,11 @@ second_build() {
 	fi
 	VERSION="$epoch$pkgver-$pkgrel"
 	echo $VERSION > $TMPDIR/b2/$SRCPACKAGE/build2.version
+	# show env variables
+	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" -- bash -l -c "$MAKEPKG_ENV_VARS makepkg $MAKEPKG_OPTIONS 2>&1" | tee -a $LOG
+		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
 	PRESULT=${PIPESTATUS[0]}
 	if [ $PRESULT -eq 124 ] ; then
 		echo "$(date -u) - makepkg was killed by timeout after ${TIMEOUT}h." | tee -a $LOG



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/fb36b41850ab57610349f9061cf6cbb969656706...bed37f555820251b4b382fda31e235e45714ee85

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/fb36b41850ab57610349f9061cf6cbb969656706...bed37f555820251b4b382fda31e235e45714ee85
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/20181011/708c3c75/attachment-0001.html>