[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: cleanup sessions more carefully

[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 dace30d88583e7e45deaa7116de8bf608db0ef59
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Sep 10 12:15:51 2015 +0200

    reproducible: cleanup sessions more carefully
---
 TODO                  |  1 +
 bin/schroot-create.sh | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/TODO b/TODO
index 2cd8d52..1c0ad1c 100644
--- a/TODO
+++ b/TODO
@@ -171,6 +171,7 @@ properties:
 
 * higher prio:
 ** reproducible_build.sh changes needed:
+*** fix: "DIFFOSCOPE='E: Failed to change to directory ‘/tmp’: Permission denied" - maybe by making sure the cause is gone…
 *** handle_unhandled() needs to unregister the build from the db too
 *** rbuild.log isnt show when a package ftbfs
 *** diffoscope needs to be run on the target arch...
diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh
index 5185932..348842c 100755
--- a/bin/schroot-create.sh
+++ b/bin/schroot-create.sh
@@ -183,8 +183,15 @@ bootstrap() {
 
 cleanup_schroot_sessions() {
 	# FIXME: if this works well, move to _common.sh and use the same function from _maintenance.sh
-	ps fax|grep -v grep |grep schroot || for i in $(schroot --all-sessions -l ) ; do ps fax|grep -v grep |grep schroot || schroot -e -c $i ; done
-	schroot --all-sessions -l
+	local RESULT=""
+	for loop in $(seq 0 9) ; do
+		ps fax|grep -v grep |grep schroot || for i in $(schroot --all-sessions -l ) ; do ps fax|grep -v grep |grep schroot || schroot -e -c $i ; done
+		RESULT=$(schroot --all-sessions -l)
+		if [ -z "$RESULT" ] ; then
+			break
+		fi
+		sleep 5
+	done
 }
 
 cleanup() {

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