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

[Holger Levsen]

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


Commits:
002797a4 by Holger Levsen at 2018-10-11T13:05:04Z
Revert "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)"

This reverts commit 1fb1230df6d15ceefa2a5d13b3cc7819a0e2be5c.

- - - - -
e76b96c6 by Holger Levsen at 2018-10-11T13:07:25Z
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: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/reproducible_build_archlinux_pkg.sh


Changes:

=====================================
bin/reproducible_build_archlinux_pkg.sh
=====================================
@@ -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)
@@ -245,12 +240,8 @@ 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" -- 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



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/a492bd5b07f22948f9d6d02af0e38dbb6239cc4a...e76b96c6112f688341b9567b027a816677a804ce

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/a492bd5b07f22948f9d6d02af0e38dbb6239cc4a...e76b96c6112f688341b9567b027a816677a804ce
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/b979013d/attachment-0001.html>