jenkins: try to prevent the build node from running out of disk space

diff --git a/jenkins-setup-build-environment b/jenkins-setup-build-environment
index 983b9b23e80a378bd3e76e08903165ef8d7837a5..dc9a77515c4c6a17fcb01df1bbb12ed78aab4d37 100755 (executable)
--- a/jenkins-setup-build-environment
+++ b/jenkins-setup-build-environment
@@ -55,6 +55,11 @@ virsh -c qemu:///system undefine buildserver_default \
       --nvram --managed-save --remove-all-storage --snapshots-metadata || true
 virsh -c qemu:///system undefine builder_default \
       --nvram --managed-save --remove-all-storage --snapshots-metadata || true
+virsh -c qemu:///system vol-delete --pool default \
+      /var/lib/libvirt/images/buildserver_vagrant_box_image_0.img || true
+virsh -c qemu:///system vol-delete --pool default \
+      /var/lib/libvirt/images/jessie64_vagrant_box_image_0.img || true
+rm -rf "$WORKSPACE"/../*/.testfiles
 
 cd $WORKSPACE
 echo "debian_mirror = 'https://deb.debian.org/debian/'" > $WORKSPACE/makebuildserver.config.py

diff --git a/jenkins-test b/jenkins-test
index 39fdaa8f4c267080d1c2abb32dcda2e1fafe18e8..b065084ad7ff7d0ce44e1c4da5ec995cea820b72 100755 (executable)
--- a/jenkins-test
+++ b/jenkins-test
@@ -23,9 +23,9 @@ 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