mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-11-05 06:50:29 +03:00
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.
This commit is contained in:
parent
f63ea5cb86
commit
0d62c3093a
1 changed files with 6 additions and 2 deletions
|
|
@ -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
|
# 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
|
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
|
# run tests in new pip+virtualenv install
|
||||||
. $WORKSPACE/env/bin/activate
|
. $WORKSPACE/env/bin/activate
|
||||||
fdroid=$WORKSPACE/env/bin/fdroid $WORKSPACE/tests/run-tests ~jenkins/
|
fdroid=$WORKSPACE/env/bin/fdroid $WORKSPACE/tests/run-tests $apksource
|
||||||
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------------#
|
#------------------------------------------------------------------------------#
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue