Commit e76b96c6 authored by Holger Levsen's avatar Holger Levsen
Browse files

reproducible Archlinux: fixup: temporarily disable building as build2 and... 


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

Signed-off-by: default avatarHolger Levsen <holger@layer-acht.org>
parent 002797a4

bin/reproducible_build_archlinux_pkg.sh

+1 −6
Original line number Diff line number Diff line
@@ -226,11 +226,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)
@@ -246,7 +241,7 @@ second_build() { 
	echo $VERSION > $TMPDIR/b2/$SRCPACKAGE/build2.version

	# 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