Merge branch 'patch-1' into 'master'

[fdroidserver.git] / jenkins-build

diff --git a/jenkins-build b/jenkins-build
index 281aa1d484cc8feb64df1c4441ca95bf3323a8f8..b7e5fd052b95d1d561bf66de00a5df8247cbebe0 100755 (executable)
--- a/jenkins-build
+++ b/jenkins-build
@@ -12,77 +12,6 @@ fi
 set -e
 set -x
 
-if [ -z $WORKSPACE ]; then
-    export WORKSPACE=`pwd`
-fi
-
-if [ -z $ANDROID_HOME ]; then
-    if [ -e ~/.android/bashrc ]; then
-        . ~/.android/bashrc
-    else
-        echo "ANDROID_HOME must be set!"
-        exit
-    fi
-fi
-
-#------------------------------------------------------------------------------#
-# required Java 7 keytool/jarsigner for :file support
-
-export PATH=/usr/lib/jvm/java-7-openjdk-amd64/bin:$PATH
-
-#------------------------------------------------------------------------------#
-# run local build
-cd $WORKSPACE/fdroidserver/getsig
-./make.sh
-
-
-#------------------------------------------------------------------------------#
-# run local tests
-cd $WORKSPACE/tests
-./run-tests.sh
-
-
-#------------------------------------------------------------------------------#
-# test building the source tarball
-cd $WORKSPACE
-python setup.py sdist
-
-
-#------------------------------------------------------------------------------#
-# test install using site packages
-cd $WORKSPACE
-rm -rf $WORKSPACE/env
-virtualenv --system-site-packages $WORKSPACE/env
-. $WORKSPACE/env/bin/activate
-pip install -e $WORKSPACE
-python setup.py install
-
-# run tests in new pip+virtualenv install
-. $WORKSPACE/env/bin/activate
-fdroid=$WORKSPACE/env/bin/fdroid $WORKSPACE/tests/run-tests.sh
-
-
-#------------------------------------------------------------------------------#
-# run pyflakes
-pyflakes fdroid makebuildserver fdroidserver/*.py setup.py
-
-
-#------------------------------------------------------------------------------#
-# run pylint
-
-cd $WORKSPACE
-set +e
-# disable E1101 until there is a plugin to handle this properly:
-#   Module 'sys' has no '_MEIPASS' member
-# disable F0401 until there is a plugin to handle this properly:
-#   keysync-gui:25: [F] Unable to import 'ordereddict'
-# use the virtualenv python so pylint checks against its installed libs
-python /usr/bin/pylint --output-format=parseable --reports=n \
-    fdroidserver/*.py fdroid makebuildserver setup.py > $WORKSPACE/pylint.parseable
-
-# to only tell jenkins there was an error if we got ERROR or FATAL, uncomment these:
-[ $(($? & 1)) = "1" ] && echo "FATALs found"
-[ $(($? & 2)) = "2" ] && echo "ERRORs found"
-[ $(($? & 4)) = "4" ] && echo "WARNINGs found"
-set -e
-
+# this is a local repo on the Guardian Project Jenkins server
+cd tests
+./complete-ci-tests /var/www/fdroid