build: include buildserverid on wiki build logs, if it exists

[fdroidserver.git] / jenkins-test

diff --git a/jenkins-test b/jenkins-test
index c8f9de8a4f8762e2d4079c8ee81bb21de199110c..245cbaa6cba499c3dcefdfa8e0e1040b8eaf56da 100755 (executable)
--- a/jenkins-test
+++ b/jenkins-test
@@ -23,9 +23,12 @@ set -x
 # set up Android SDK to use the Debian packages in stretch
 export ANDROID_HOME=/usr/lib/android-sdk
 
-rm -rf $WORKSPACE/.testfiles
+rm -rf "$WORKSPACE/.testfiles"
 cd tests
-./run-tests $WORKSPACE
+echo "Debian's build-tools is too old, remove once the package has been updated"
+sed -i '/android.permission.READ_EXTERNAL_STORAGE/d' repo/index.xml
+sed -i '/^diff -uw .*index-v1.json$/d' run-tests
+./run-tests $WORKSPACE/fdroiddata/repo
 
 # this is set up and managed by jenkins-build-all
 cd $WORKSPACE/fdroiddata
@@ -35,6 +38,8 @@ rm -f config.py keystore.jks
 ../fdroid update
 
 export GNUPGHOME=$WORKSPACE/tests/gnupghome
+gpg --import $GNUPGHOME/secring.gpg
+
 echo "build_server_always = True" >> config.py
 echo "gpghome = '$GNUPGHOME'" >> config.py
 echo "gpgkey = 'CE71F7FB'" >> config.py