[Qa-jenkins-scm] [jenkins.debian.net] 01/02: reproducible fdroid: cleanup workspace at the beginning of the job instead of the end

[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 3cd9d142607519d9141d76fb6ff74f5c22485d76
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Jan 27 13:19:01 2016 +0100

    reproducible fdroid: cleanup workspace at the beginning of the job instead of the end
---
 bin/reproducible_setup_fdroid_build_environment.sh | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/bin/reproducible_setup_fdroid_build_environment.sh b/bin/reproducible_setup_fdroid_build_environment.sh
index 0c40662..99550f7 100755
--- a/bin/reproducible_setup_fdroid_build_environment.sh
+++ b/bin/reproducible_setup_fdroid_build_environment.sh
@@ -13,27 +13,24 @@ common_init "$@"
 # common code
 . /srv/jenkins/bin/reproducible_common.sh
 
-# define work space (differently than jenkins would normally do as we run via ssh on a different node…)
+# define and clean work space (differently than jenkins would normally do as we run via ssh on a different node…)
 WORKSPACE=$BASE/fdroid
+# TODO:
+#
+# add locking here to only run this if no build job is running…
+#
+# not yet needed, as we don't have any build jobs yet
+rm $WORKSPACE -r
 mkdir -p $WORKSPACE
 
 cleanup_all() {
 	echo "$(date -u) - cleanup in progress..."
 	killall VBoxHeadless || true
 	sleep 10
-	rm $WORKSPACE -r
 	echo "$(date -u) - cleanup done."
 }
 trap cleanup_all INT TERM EXIT
 
-# TODO:
-#
-#
-# add locking here to only run this if no build job is running…
-#
-#
-# not yet needed, as we don't have any build jobs yet
-
 
 # make sure we have the vagrant box image cached
 test -e ~/.cache/fdroidserver || mkdir -p ~/.cache/fdroidserver

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