build: log vcs tools version on every build attempt

[fdroidserver.git] / jenkins-test

diff --git a/jenkins-test b/jenkins-test
index 65064d3bb737fa6a4b5ae67e8bc1f98be738a4be..74fbba53a6d7bfb8468fa0ef4b643cdaf766c957 100755 (executable)
--- a/jenkins-test
+++ b/jenkins-test
@@ -20,33 +20,36 @@ fi
 set -e
 set -x
 
-cd tests
-./run-tests $WORKSPACE/fdroiddata/unsigned
-
 # set up Android SDK to use the Debian packages in stretch
 export ANDROID_HOME=/usr/lib/android-sdk
 
-# the way we handle jenkins slaves doesn't copy the workspace to the slaves
-# so we need to "manually" clone the git repo here…
+rm -rf $WORKSPACE/.testfiles
+cd tests
+./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
 
 # publish process when building and signing are on separate machines
 test -d repo || mkdir repo
 test -d archive || mkdir archive
 # when everything is copied over to run on SIGN machine
-../fdroid publish --verbose
-../fdroid gpgsign --verbose
+../fdroid publish
+../fdroid gpgsign
 # when everything is copied over to run on BUILD machine
-../fdroid update --verbose --nosign
+../fdroid update --nosign
 # when everything is copied over to run on SIGN machine
 ../fdroid signindex --verbose
 
-../fdroid rewritemeta --verbose
+../fdroid rewritemeta --quiet
 git --no-pager diff