Merge branch '430-UnboundLocalError-local-variable-im-referenced-before-assignment...

[fdroidserver.git] / jenkins-test

diff --git a/jenkins-test b/jenkins-test
index aa7f370ec88318e6d40827d8ca80be7c53a9d318..c8f9de8a4f8762e2d4079c8ee81bb21de199110c 100755 (executable)
--- a/jenkins-test
+++ b/jenkins-test
@@ -23,18 +23,23 @@ set -x
 # set up Android SDK to use the Debian packages in stretch
 export ANDROID_HOME=/usr/lib/android-sdk
 
+rm -rf $WORKSPACE/.testfiles
 cd tests
-./run-tests $WORKSPACE/fdroiddata/unsigned
+./run-tests $WORKSPACE
 
 # this is set up and managed by jenkins-build-all
 cd $WORKSPACE/fdroiddata
 
-test -e config.py || ../fdroid init --verbose
+rm -f config.py keystore.jks
+../fdroid init --verbose
+../fdroid update
 
 export GNUPGHOME=$WORKSPACE/tests/gnupghome
-echo "build_server_always = True" > config.py
+echo "build_server_always = True" >> config.py
 echo "gpghome = '$GNUPGHOME'" >> config.py
 echo "gpgkey = 'CE71F7FB'" >> config.py
+chmod 0600 config.py
+sed -i '/\s*repo_key_sha256\s*=.*/d' config.py
 
 # publish process when building and signing are on separate machines
 test -d repo || mkdir repo