From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 11 Mar 2015 21:40:26 +0000 (-0400)
Subject: jenkins-build: always use speced dir for APK source
X-Git-Tag: 0.4.0~76^2~7
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0d62c3093afe7c948ea850fea4cf409a0bb86eb6;p=fdroidserver.git

jenkins-build: always use speced dir for APK source

Otherwise, the test process can pick up lots and lots of APKs from various
places like a ~/fdroid folder or various ~/workspace/fdroidserver Jenkins
projects.
---

diff --git a/jenkins-build b/jenkins-build
index 8a7ca9bd..cb94ebdf 100755
--- a/jenkins-build
+++ b/jenkins-build
@@ -41,8 +41,12 @@ export PATH=/usr/lib/jvm/java-7-openjdk-amd64/bin:$PATH
 
 #------------------------------------------------------------------------------#
 # run local tests, don't scan fdroidserver/ project for APKs
+
+# this is a local repo on the Guardian Project Jenkins server
+apksource=/var/www/fdroid
+
 cd $WORKSPACE/tests
-./run-tests ~jenkins/workspace/[[:upper:]a-eg-z]\*
+./run-tests $apksource
 
 
 #------------------------------------------------------------------------------#
@@ -62,7 +66,7 @@ python2 setup.py install
 
 # run tests in new pip+virtualenv install
 . $WORKSPACE/env/bin/activate
-fdroid=$WORKSPACE/env/bin/fdroid $WORKSPACE/tests/run-tests ~jenkins/
+fdroid=$WORKSPACE/env/bin/fdroid $WORKSPACE/tests/run-tests $apksource
 
 
 #------------------------------------------------------------------------------#