From fad98eeb7fb7fd2593f98f18272d7b6b94ddfe79 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michael=20P=C3=B6hn?= Date: Mon, 6 Mar 2017 02:57:07 +0100 Subject: [PATCH] build: fixed kvm snapshot support; makebuildserver: setup kvm ssh credentials --- fdroidserver/build.py | 7 ++++--- makebuildserver | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 453a555b..d9ef9a0e 100644 --- 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 abc4ca73..e91a9282 100755 --- 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| -- 2.30.2