[Qa-jenkins-scm] [jenkins.debian.net] 01/01: torbrowser tests: always install ca-certificates on jessie+wheezy

[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 89ae77990db442cbb88cfbe2e2f1e32a64a94169
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Feb 28 17:57:56 2016 +0100

    torbrowser tests: always install ca-certificates on jessie+wheezy
---
 bin/test_torbrowser-launcher.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index c841ad4..5cc2795 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -153,6 +153,10 @@ announce_problem_and_abort_silently() {
 
 prepare_other_packages() {
 	# once #805173 is fixed in all tested suites, ca-certificates doesn't have to be installed here anymore
+	if [ "$SUITE" = "wheezy" ] || [ "$SUITE" = "jessie" ] ; then
+		schroot --run-session -c $SESSION --directory $TMPDIR -u root -- apt-get install -y ca-certificates
+	fi
+	# tor is only a recommends and we don't install recommends by default…
 	if $VIA_TOR ; then
 		echo "$(date -u ) - installing tor as this test will download torbrowser via the system tor service."
 		schroot --run-session -c $SESSION --directory $TMPDIR -u root -- apt-get install -y tor

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