[Qa-jenkins-scm] [jenkins.debian.net] 02/03: schroot-create: disable package description downloads for all chroots, not just reproducible's. While on it, add other similar confs

[Mattia Rizzolo]

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

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

commit 1e0bc4d8fa2b08a800d7a673658ceb86d18cb4ed
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Wed Apr 4 19:47:43 2018 +0200

    schroot-create: disable package description downloads for all chroots, not just reproducible's.  While on it, add other similar confs
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 bin/schroot-create.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh
index 7a97a32..5877208 100755
--- a/bin/schroot-create.sh
+++ b/bin/schroot-create.sh
@@ -112,8 +112,6 @@ apt-key list
 echo
 echo "Configuring APT to ignore the Release file expiration"
 echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/398future
-echo "Configuring APT to not download package descriptions"
-echo 'Acquire::Languages "none";' > /etc/apt/apt.conf.d/10no-package-descriptions
 echo
 EOF
 }
@@ -164,6 +162,15 @@ bootstrap() {
 		[ -z "${EXTRA_SOURCES[$i]}" ] || echo "${EXTRA_SOURCES[$i]}"                     | sudo tee -a $SCHROOT_TARGET/etc/apt/sources.list >/dev/null
 	done
 
+	# Misc configuration for a building-aimed chroot
+	sudo tee "$SCHROOT_TARGET/etc/apt/apt.conf.d/15jenkins" > /dev/null <<-__END__
+	APT::Install-Recommends "false";
+	APT::AutoRemove::SuggestsImportant false;
+	APT::AutoRemove::RecommendsImportant false;
+	# don't download package descriptions
+	Acquire::Languages none;
+	__END__
+
 	if $REPRODUCIBLE ; then
 		TMPFILE=$(mktemp -u)
 		reproducible_setup $SCHROOT_TARGET/$TMPFILE

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