From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 8 Nov 2017 12:14:44 +0000 (+0100)
Subject: jenkins-test: ./run-tests needs ANDROID_HOME
X-Git-Tag: 0.9~28
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6bcdf6439b8bc5135af335bb514635632ac65124;p=fdroidserver.git

jenkins-test: ./run-tests needs ANDROID_HOME
---

diff --git a/jenkins-test b/jenkins-test
index 65064d3b..e4f33efd 100755
--- a/jenkins-test
+++ b/jenkins-test
@@ -20,14 +20,13 @@ fi
 set -e
 set -x
 
-cd tests
-./run-tests $WORKSPACE/fdroiddata/unsigned
-
 # set up Android SDK to use the Debian packages in stretch
 export ANDROID_HOME=/usr/lib/android-sdk
 
-# the way we handle jenkins slaves doesn't copy the workspace to the slaves
-# so we need to "manually" clone the git repo here…
+cd tests
+./run-tests $WORKSPACE/fdroiddata/unsigned
+
+# this is set up and managed by jenkins-build-all
 cd $WORKSPACE/fdroiddata
 
 test -e config.py || ../fdroid init --verbose