Commit 1fb1230d authored by Holger Levsen's avatar Holger Levsen
Browse files

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


reproducible Archlinux: 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 4d6b2a77

bin/reproducible_build_archlinux_pkg.sh

+5 −1
Original line number Diff line number Diff line
@@ -245,8 +245,12 @@ second_build() { 
	VERSION="$epoch$pkgver-$pkgrel"

	echo $VERSION > $TMPDIR/b2/$SRCPACKAGE/build2.version

	# nicely run makepkg with a timeout of $TIMEOUT hours

	###temporarily disable building as build2 and build as jenkins user

	###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

	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