[Qa-jenkins-scm] [jenkins.debian.net] 01/02: reproducible fdroid: make fdroid_build_apps reuse the git repo

[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 a964a2cb4b0f3e59912fb927998ed5a505cba3c7
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Mon Apr 24 13:22:14 2017 +0200

    reproducible fdroid: make fdroid_build_apps reuse the git repo
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_fdroid_build_apps.sh | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_fdroid_build_apps.sh b/bin/reproducible_fdroid_build_apps.sh
index dc08735..e7310ed 100755
--- a/bin/reproducible_fdroid_build_apps.sh
+++ b/bin/reproducible_fdroid_build_apps.sh
@@ -14,10 +14,23 @@ common_init "$@"
 # common code
 . /srv/jenkins/bin/reproducible_common.sh
 
-# define and clean work space (differently than jenkins would normally do as we run via ssh on a different node…)
+# define and clean work space on the machine actually running the
+# build. jenkins.debian.net does not use Jenkins slaves.  Instead
+# /srv/jenkins/bin/jenkins_master_wrapper.sh runs this script on the
+# slave using a directl call to ssh.
 WORKSPACE=$BASE/fdroid-build
-rm $WORKSPACE -rf
-mkdir -p $WORKSPACE
+if [ -e $WORKSPACE/.git ]; then
+    # reuse the git repo if possible, to keep all the setup in fdroiddata/
+    git clean -fdx
+    git reset --hard
+    git checkout master
+    git clean -fdx
+    git reset --hard
+else
+    rm -rf $WORKSPACE
+    git clone https://gitlab.com/eighthave/fdroidserver-for-jenkins.debian.net.git $WORKSPACE
+fi
+cd $WORKSPACE
 
 cleanup_all() {
 	echo "$(date -u) - cleanup in progress..."

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