Merge branch 'nightly-fixes' into 'master'

more `fdroid nightly` polishing

See merge request fdroid/fdroidserver!399

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index e15651d35550981a45115a787aff51c4e35c5685..6e022f4792ddad9aa19da0a2eaeaf19424cec6a7 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1088,7 +1088,7 @@ class vcs_hg(vcs):
                     raise VCSException("Unexpected output from hg status -uS: " + line)
                 FDroidPopen(['rm', '-rf', line[2:]], cwd=self.local, output=False)
             if not self.refreshed:
-                p = FDroidPopen(['hg', 'pull'], '--ssh', 'false', cwd=self.local, output=False)
+                p = FDroidPopen(['hg', 'pull', '--ssh', 'false'], cwd=self.local, output=False)
                 if p.returncode != 0:
                     raise VCSException("Hg pull failed", p.output)
                 self.refreshed = True

diff --git a/jenkins-setup-build-environment b/jenkins-setup-build-environment
index a7829c6fe66cc3558ff90cdeb2f2b842325cbb31..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