build: fixed kvm snapshot support; makebuildserver: setup kvm ssh credentials

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 453a555bebf07075900a413580ff0f54921fa02d..d9ef9a0e46940d5418ce644549f682639f09c3b2 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -132,7 +132,7 @@ def vm_snapshot_list(provider):
                          get_builder_vm_id(provider), 'list',
                          '--details'], cwd='builder')
     elif provider is 'libvirt':
-        p = FDroidPopen(['virsh', 'snapshot-list',
+        p = FDroidPopen(['virsh', '-c', 'qemu:///system', 'snapshot-list',
                          get_builder_vm_id(provider)])
     return p.output
 
@@ -149,17 +149,18 @@ def vm_snapshot_restore(provider):
                          get_builder_vm_id(provider), 'restore',
                          'fdroidclean'], cwd='builder')
     elif provider is 'libvirt':
-        p = FDroidPopen(['virsh', 'snapshot-revert',
+        p = FDroidPopen(['virsh', '-c', 'qemu:///system', 'snapshot-revert',
                          get_builder_vm_id(provider), 'fdroidclean'])
     return p.returncode == 0
 
+
 def vm_snapshot_create(provider):
     if provider is 'virtualbox':
         p = FDroidPopen(['VBoxManage', 'snapshot',
                          get_builder_vm_id(provider),
                          'take', 'fdroidclean'], cwd='builder')
     elif provider is 'libvirt':
-        p = FDroidPopen(['virsh', 'snapshot-create-as',
+        p = FDroidPopen(['virsh', '-c', 'qemu:///system', 'snapshot-create-as',
                          get_builder_vm_id(provider), 'fdroidclean'])
     return p.returncode != 0
 

diff --git a/makebuildserver b/makebuildserver
index abc4ca734142e272e589dffb90dd5fe1c326e0c0..e91a9282c7cc9a5900b2499a1383de47a63ff3c5 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -341,6 +341,8 @@ def kvm_package(boxfile):
 }
 """
         vagrantfile = """Vagrant.configure("2") do |config|
+  config.ssh.username = "vagrant"
+  config.ssh.password = "vagrant"
 
   config.vm.provider :libvirt do |libvirt|