jenkins-build: switch buildserver to new 64-bit base

[fdroidserver.git] / jenkins-build-makebuildserver

diff --git a/jenkins-build-makebuildserver b/jenkins-build-makebuildserver
index 193718b2fe7750c40ae72bd38082143f856bdb4d..7f1cdf954cbf8e69be7900ec1e9f6e37f7b20ec7 100755 (executable)
--- a/jenkins-build-makebuildserver
+++ b/jenkins-build-makebuildserver
@@ -29,9 +29,9 @@ set -x
 # make sure we have the vagrant box image cached
 test -e ~/.cache/fdroidserver || mkdir -p ~/.cache/fdroidserver
 cd ~/.cache/fdroidserver
-wget --tries=1 --timeout=5 --continue https://f-droid.org/jessie32.box || true
-echo "ff6b0c0bebcb742783becbc51a9dfff5a2a0a839bfcbfd0288dcd3113f33e533  jessie32.box" > jessie32.box.sha256
-sha256sum -c jessie32.box.sha256
+wget --tries=1 --timeout=5 --continue https://f-droid.org/jessie64.box || true
+echo "de3e3c4a9c13e8c015e30edeea0f583b195d1ee8ff9ad4814e933bbfb560200f  jessie64.box" > jessie64.box.sha256
+sha256sum -c jessie64.box.sha256
 
 # redirect homes to be in the git repo, so they'll get cleaned and reset
 export XDG_CONFIG_HOME=$WORKSPACE
@@ -46,11 +46,12 @@ cd $WORKSPACE
 echo "debian_mirror = 'http://ftp.uk.debian.org/debian/'" > $WORKSPACE/makebuildserver.config.py
 echo "boot_timeout = 1200" >> $WORKSPACE/makebuildserver.config.py
 echo "apt_package_cache = True" >> $WORKSPACE/makebuildserver.config.py
-./makebuildserver
+./makebuildserver --verbose
 
 # this can be handled in the jenkins job, or here:
 if [ -e fdroiddata ]; then
     cd fdroiddata
+    git checkout master
     git pull
     cd ..
 else
@@ -60,14 +61,12 @@ fi
 cd fdroiddata
 echo "build_server_always = True" > config.py
 # Gradle, JNI, preassemble
-../fdroid build org.adaway:55
+../fdroid build --stop org.adaway:55
 # Maven
-../fdroid build org.quantumbadger.redreader:55
-# Ant, submodules and custom prebuild/build
-../fdroid build app.openconnect:959
+../fdroid build --stop org.quantumbadger.redreader:55
 # Custom build (make)
-../fdroid build org.xcsoar:101
+../fdroid build --stop com.amaze.filemanager:29
 # Uses verification
-../fdroid build info.guardianproject.checkey:101
+../fdroid build --stop info.guardianproject.checkey:101
 # Gradle with retrolambda (JDK7 and JDK8)
-../fdroid build com.moez.QKSMS:124
+../fdroid build --stop com.moez.QKSMS:124