X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=jenkins-setup-build-environment;h=dc9a77515c4c6a17fcb01df1bbb12ed78aab4d37;hb=02203efe1582c90137209900dc30dbc55843bbaf;hp=026c5507e152f780d0af6025d7497983427122c2;hpb=3a04ec91b79c483f4bb78cf65f79a873183a258a;p=fdroidserver.git

diff --git a/jenkins-setup-build-environment b/jenkins-setup-build-environment
index 026c5507..dc9a7751 100755
--- a/jenkins-setup-build-environment
+++ b/jenkins-setup-build-environment
@@ -50,6 +50,17 @@ fi
 export VAGRANT_HOME=$WORKSPACE/vagrant.d
 mkdir $VAGRANT_HOME
 
+# delete leftovers from previous run
+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
 echo "boot_timeout = 1200" >> $WORKSPACE/makebuildserver.config.py
@@ -68,7 +79,7 @@ fi
 # this can be handled in the jenkins job, or here:
 if [ -e fdroiddata ]; then
     cd fdroiddata
-    while ! git fetch; do sleep 1; done
+    while ! git fetch origin --tags --prune; do sleep 10; done
     git remote update -p
     git checkout master
     git reset --hard origin/master
@@ -79,6 +90,7 @@ else
 fi
 
 cd fdroiddata
+echo "build_server_always = True" > config.py
 
 if [ -z $ANDROID_HOME ]; then
     if [ -e ~/.android/bashrc ]; then