[Qa-jenkins-scm] [jenkins.debian.net] 01/01: silence cleanup
Holger Levsen
holger at moszumanska.debian.org
Sat Nov 14 18:06:15 UTC 2015
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 5b4d966be7d97468611c7f72758c09ae658ee77a
Author: Holger Levsen <holger at layer-acht.org>
Date: Sat Nov 14 19:05:16 2015 +0100
silence cleanup
---
bin/test_torbrowser-launcher.sh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index b37b991..7bf624a 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -11,14 +11,17 @@ set -e
cleanup_all() {
set +e
+ # preserve screenshots
+ [ ! -f screenshot.png ] || mv screenshot.png $WORKSPACE/ || true
+ [ ! -f screenshot-thumb.png ] || mv screenshot-thumb.png $WORKSPACE/ || true
+ # actual cleanup starts here
cd
- mv screenshot.png screenshot-thumb.png $WORKSPACE/ || true
# delete session if it still exists
schroot --end-session -c tbb-launcher-$SUITE-$(basename $TMPDIR) > /dev/null 2>&1 || true
# delete main work dir
rm $TMPDIR -r
# kill xvfb
- kill $XPID
+ kill $XPID 2>/dev/null|| true
# end
echo "$(date -u) - $TMPDIR deleted. Cleanup done."
}
--
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