[Qa-jenkins-scm] [jenkins.debian.net] 02/02: reproducible Arch Linux: adding build debug for pacman and makepkg conf

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 41ffb029ef1e76c8ce7b0ddadfa15925355042e0
Author: anthraxx <levente at leventepolyak.net>
Date:   Fri Nov 24 01:09:40 2017 +0100

    reproducible Arch Linux: adding build debug for pacman and makepkg conf
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_build_archlinux_pkg.sh | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh
index c5a64e8..c2e4e32 100755
--- a/bin/reproducible_build_archlinux_pkg.sh
+++ b/bin/reproducible_build_archlinux_pkg.sh
@@ -159,11 +159,18 @@ first_build() {
 	ACTUAL_SRCPACKAGE=$(ls "$BUILDDIR")
 	# just set timezone in the 1st build
 	echo 'export TZ="/usr/share/zoneinfo/Etc/GMT+12"' | schroot --run-session -c $SESSION --directory /tmp -- tee -a /var/lib/jenkins/.bashrc
+	echo "============================================================================="
+	echo "Current configuration values follow:"
+	echo "============================================================================="
+	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- cat /etc/pacman.conf 2>&1 | tee -a $LOG
+	echo "============================================================================="
+	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- cat /etc/makepkg.conf 2>&1 | tee -a $LOG
+	echo "============================================================================="
 	# update before pulling new dependencies
 	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- sudo pacman -Syu --noconfirm 2>&1 | tee -a $LOG
 	# log installed packages and used mirrors
 	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- grep '^Server' /etc/pacman.d/mirrorlist 2>&1 | tee -a $LOG
-	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- pacman -Qe 2>&1 | tee -a $LOG
+	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- pacman -Q 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 --syncdeps --noconfirm 2>&1" | tee -a $LOG
@@ -232,11 +239,18 @@ second_build() {
 	export LC_ALL="fr_CH.UTF-8"
 	umask 0002
 	__END__
+	echo "============================================================================="
+	echo "Current configuration values follow:"
+	echo "============================================================================="
+	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- cat /etc/pacman.conf 2>&1 | tee -a $LOG
+	echo "============================================================================="
+	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- cat /etc/makepkg.conf 2>&1 | tee -a $LOG
+	echo "============================================================================="
 	# update before pulling new dependencies
 	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- sudo pacman -Syu --noconfirm 2>&1 | tee -a $LOG
 	# log installed packages and used mirrors
 	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- grep '^Server' /etc/pacman.d/mirrorlist 2>&1 | tee -a $LOG
-	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- pacman -Qe 2>&1 | tee -a $LOG
+	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- pacman -Q 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 --syncdeps --noconfirm 2>&1" | tee -a $LOG

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git