Merge branch 'additional_tests' into 'master'

[fdroidserver.git] / jenkins-test

diff --git a/jenkins-test b/jenkins-test
index 69ed58a398b6a42049ec1955e153d76d19a24afd..39fdaa8f4c267080d1c2abb32dcda2e1fafe18e8 100755 (executable)
--- a/jenkins-test
+++ b/jenkins-test
@@ -30,15 +30,18 @@ cd tests
 # 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