Merge branch 'some-bug-fixes' into 'master'

[fdroidserver.git] / jenkins-build

diff --git a/jenkins-build b/jenkins-build
index 35add775cf37ae57b34a3d8b16f81ee268b043f5..8a7ca9bdfa10c15a503e5e6338062ccc0037c797 100755 (executable)
--- a/jenkins-build
+++ b/jenkins-build
@@ -38,32 +38,27 @@ fi
 
 export PATH=/usr/lib/jvm/java-7-openjdk-amd64/bin:$PATH
 
-#------------------------------------------------------------------------------#
-# run local build
-cd $WORKSPACE/fdroidserver/getsig
-./make.sh
-
 
 #------------------------------------------------------------------------------#
-# run local tests
+# run local tests, don't scan fdroidserver/ project for APKs
 cd $WORKSPACE/tests
-./run-tests ~jenkins/
+./run-tests ~jenkins/workspace/[[:upper:]a-eg-z]\*
 
 
 #------------------------------------------------------------------------------#
 # test building the source tarball
 cd $WORKSPACE
-python setup.py sdist
+python2 setup.py sdist
 
 
 #------------------------------------------------------------------------------#
 # test install using site packages
 cd $WORKSPACE
 rm -rf $WORKSPACE/env
-virtualenv --system-site-packages $WORKSPACE/env
+virtualenv --python=python2 --system-site-packages $WORKSPACE/env
 . $WORKSPACE/env/bin/activate
 pip install -e $WORKSPACE
-python setup.py install
+python2 setup.py install
 
 # run tests in new pip+virtualenv install
 . $WORKSPACE/env/bin/activate
@@ -81,7 +76,7 @@ sh hooks/pre-commit
 cd $WORKSPACE
 set +e
 # use the virtualenv python so pylint checks against its installed libs
-    PYTHONPATH=$WORKSPACE/.pylint-plugins python /usr/bin/pylint \
+    PYTHONPATH=$WORKSPACE/.pylint-plugins python2 /usr/bin/pylint \
         --output-format=parseable --reports=n \
         --load-plugins astng_hashlib \
         fdroidserver/*.py fdroid makebuildserver setup.py > $WORKSPACE/pylint.parseable