nightly: support arbitrary keystore files for setup

[fdroidserver.git] / jenkins-test

diff --git a/jenkins-test b/jenkins-test
index 69ed58a398b6a42049ec1955e153d76d19a24afd..b065084ad7ff7d0ce44e1c4da5ec995cea820b72 100755 (executable)
--- a/jenkins-test
+++ b/jenkins-test
@@ -23,22 +23,25 @@ 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
+./run-tests $WORKSPACE/fdroiddata/repo
 
 # this is set up and managed by jenkins-build-all
 cd $WORKSPACE/fdroiddata
 
-rm -f config.py
+rm -f config.py keystore.jks
 ../fdroid init --verbose
 ../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
 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