[Qa-jenkins-scm] [jenkins.debian.net] 01/05: reproducible Arch Linux: remove overly verbose debugging

[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 dc83c4846179e739a045b314251915f35fb2099a
Author: anthraxx <levente at leventepolyak.net>
Date:   Fri Dec 8 23:22:31 2017 +0100

    reproducible Arch Linux: remove overly verbose debugging
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_build_archlinux_pkg.sh     | 28 ++--------------------------
 bin/reproducible_setup_archlinux_schroot.sh |  2 +-
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh
index 694db80..7bc083c 100755
--- a/bin/reproducible_build_archlinux_pkg.sh
+++ b/bin/reproducible_build_archlinux_pkg.sh
@@ -140,20 +140,8 @@ 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 -Syyu --debug --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 -Q 2>&1 | tee -a $LOG
-	# TODO: debugging, remove me
-	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- pacman -Si gnupg 2>&1 | tee -a $LOG
+	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- sudo pacman -Syu --noconfirm 2>&1 | tee -a $LOG
 	# determine the version of the package being build
 	source "$BUILDDIR/$ACTUAL_SRCPACKAGE/trunk/PKGBUILD"
 	if [ -n "$epoch" ] ; then
@@ -228,20 +216,8 @@ 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 -Syyu --debug --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 -Q 2>&1 | tee -a $LOG
-	# TODO: debugging, remove me
-	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- pacman -Si gnupg 2>&1 | tee -a $LOG
+	schroot --run-session -c $SESSION --directory "$BUILDDIR" -- sudo pacman -Syu --noconfirm 2>&1 | tee -a $LOG
 	# determine the version of the package being build
 	source "$BUILDDIR/$ACTUAL_SRCPACKAGE/trunk/PKGBUILD"
 	if [ -n "$epoch" ] ; then
diff --git a/bin/reproducible_setup_archlinux_schroot.sh b/bin/reproducible_setup_archlinux_schroot.sh
index 3a90bdd..37a14d9 100755
--- a/bin/reproducible_setup_archlinux_schroot.sh
+++ b/bin/reproducible_setup_archlinux_schroot.sh
@@ -123,7 +123,7 @@ echo "==========================================================================
 $ROOTCMD cat /etc/makepkg.conf
 echo "============================================================================="
 
-$ROOTCMD bash -l -c 'pacman -Syyu --noconfirm --debug'
+$ROOTCMD bash -l -c 'pacman -Syu --noconfirm'
 $ROOTCMD bash -l -c 'pacman -S --noconfirm --needed base-devel multilib-devel devtools fakechroot asciidoc asp expac dash'
 # configure sudo
 echo 'jenkins ALL= NOPASSWD: /usr/sbin/pacman *' | $ROOTCMD tee -a /etc/sudoers

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