From 0d62c3093afe7c948ea850fea4cf409a0bb86eb6 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 11 Mar 2015 17:40:26 -0400 Subject: [PATCH] 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. --- jenkins-build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 #------------------------------------------------------------------------------# -- 2.30.2