Merge branch 'typo' into 'master'

[fdroidserver.git] / jenkins-setup-build-environment

diff --git a/jenkins-setup-build-environment b/jenkins-setup-build-environment
index abe123bda0c0b7101c3374a0cc4ef19f8e0cbe8e..983b9b23e80a378bd3e76e08903165ef8d7837a5 100755 (executable)
--- a/jenkins-setup-build-environment
+++ b/jenkins-setup-build-environment
@@ -50,6 +50,12 @@ 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
+
 cd $WORKSPACE
 echo "debian_mirror = 'https://deb.debian.org/debian/'" > $WORKSPACE/makebuildserver.config.py
 echo "boot_timeout = 1200" >> $WORKSPACE/makebuildserver.config.py
@@ -68,7 +74,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