Merge branch 'mr/update_platforms_tools' into 'master'

[fdroidserver.git] / jenkins-build-makebuildserver

diff --git a/jenkins-build-makebuildserver b/jenkins-build-makebuildserver
index 6d459fa5722bb916cb677bb454ab3ed8899e2470..b30b41c6710ae6d5ce2eef4d61564c46cb53c1fd 100755 (executable)
--- a/jenkins-build-makebuildserver
+++ b/jenkins-build-makebuildserver
@@ -14,6 +14,8 @@ cleanup_all() {
     set +e
     echo "$(date -u) - cleanup in progress..."
     ps auxww | grep -e VBox -e qemu
+    virsh --connect qemu:///system list --all
+    ls -hl /var/lib/libvirt/images
     cd $WORKSPACE/buildserver
     vagrant halt
     sleep 5
@@ -49,14 +51,23 @@ cd $WORKSPACE
 echo "debian_mirror = 'https://deb.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 --verbose --clean
+echo "copy_caches_from_host = True" >> $WORKSPACE/makebuildserver.config.py
+./makebuildserver -vv --clean
+
+if [ -z "`vagrant box list | egrep '^buildserver\s+\((libvirt|virtualbox), [0-9]+\)$'`" ]; then
+    vagrant box list
+    echo "ERROR: buildserver box does not exist!"
+    exit 1
+fi
 
 # this can be handled in the jenkins job, or here:
 if [ -e fdroiddata ]; then
     cd fdroiddata
+    while ! git fetch; do sleep 1; done
     git remote update -p
     git checkout master
     git reset --hard origin/master
+    git clean -fdx
     cd ..
 else
     git clone --depth 1 https://gitlab.com/fdroid/fdroiddata.git fdroiddata
@@ -69,7 +80,7 @@ if [ -z $ANDROID_HOME ]; then
         . ~/.android/bashrc
     else
         echo "ANDROID_HOME must be set!"
-        exit
+        exit 1
     fi
 fi
 
@@ -88,14 +99,17 @@ echo "build_server_always = True" >> config.py
 # building old versions should still work
 ../fdroid build --verbose --stop org.fdroid.fdroid:96150
 # test OTA update ZIP build and publish
-../fdroid build --verbose --stop --latest org.fdroid.fdroid.privileged.ota
+../fdroid build --verbose --stop org.fdroid.fdroid.privileged.ota:2030
 
 # publish process when building and signing are on separate machines
 test -d repo || mkdir repo
 test -d archive || mkdir archive
+# copy everything over to run on SIGN machine
 ../fdroid publish --verbose
 ../fdroid gpgsign --verbose
+# copy everything over to run on BUILD machine
 ../fdroid update --verbose --nosign
+# copy everything over to run on SIGN machine
 ../fdroid signindex --verbose
 
 ../fdroid rewritemeta --verbose