[Qa-jenkins-scm] [jenkins.debian.net] 01/01: torbrowser tests: avoid suboptimal cleanup…

Holger Levsen holger at moszumanska.debian.org
Thu Jan 28 00:49:02 UTC 2016


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 5d2cebd08ea4e179ac74ff4ca8465f1ae952174b
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Jan 28 01:48:52 2016 +0100

    torbrowser tests: avoid suboptimal cleanup…
---
 bin/schroot-create.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh
index 934ff38..6b4fae7 100755
--- a/bin/schroot-create.sh
+++ b/bin/schroot-create.sh
@@ -215,7 +215,10 @@ trap - INT TERM EXIT
 rand=$RANDOM
 if [ -d $SCHROOT_BASE/"$TARGET" ]
 then
-	cleanup_schroot_sessions
+	# no needed for torbrowser-launcher as race conditions are mostly avoided by timings
+	if [ "${TARGET:0:19}" != "torbrowser-launcher" ] ; then
+		cleanup_schroot_sessions
+	fi
 	echo "$(date -u ) - $SCHROOT_BASE/$TARGET exists, moving it away to $SCHROOT_BASE/$TARGET-$rand"
 	set +e
 	sudo mv $SCHROOT_BASE/"$TARGET" $SCHROOT_BASE/"$TARGET"-"$rand"

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



More information about the Qa-jenkins-scm mailing list