mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 14:32:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Michael Pöhn 2017-03-06 02:57:07 +01:00 • committed by Hans-Christoph Steiner
parent fa2d44ee94
commit fad98eeb7f
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
fdroidserver/build.py
View file

@ -132,7 +132,7 @@ def vm_snapshot_list(provider):
get_builder_vm_id(provider), 'list', get_builder_vm_id(provider), 'list',
'--details'], cwd='builder') '--details'], cwd='builder')
elif provider is 'libvirt': elif provider is 'libvirt':
p = FDroidPopen(['virsh', 'snapshot-list', p = FDroidPopen(['virsh', '-c', 'qemu:///system', 'snapshot-list',
get_builder_vm_id(provider)]) get_builder_vm_id(provider)])
return p.output return p.output
@ -149,17 +149,18 @@ def vm_snapshot_restore(provider):
get_builder_vm_id(provider), 'restore', get_builder_vm_id(provider), 'restore',
'fdroidclean'], cwd='builder') 'fdroidclean'], cwd='builder')
elif provider is 'libvirt': elif provider is 'libvirt':
p = FDroidPopen(['virsh', 'snapshot-revert', p = FDroidPopen(['virsh', '-c', 'qemu:///system', 'snapshot-revert',
get_builder_vm_id(provider), 'fdroidclean']) get_builder_vm_id(provider), 'fdroidclean'])
return p.returncode == 0 return p.returncode == 0
def vm_snapshot_create(provider): def vm_snapshot_create(provider):
if provider is 'virtualbox': if provider is 'virtualbox':
p = FDroidPopen(['VBoxManage', 'snapshot', p = FDroidPopen(['VBoxManage', 'snapshot',
get_builder_vm_id(provider), get_builder_vm_id(provider),
'take', 'fdroidclean'], cwd='builder') 'take', 'fdroidclean'], cwd='builder')
elif provider is 'libvirt': 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']) get_builder_vm_id(provider), 'fdroidclean'])
return p.returncode != 0 return p.returncode != 0

2
makebuildserver
View file

@ -341,6 +341,8 @@ def kvm_package(boxfile):
} }
""" """
vagrantfile = """Vagrant.configure("2") do |config| vagrantfile = """Vagrant.configure("2") do |config|
config.ssh.username = "vagrant"
config.ssh.password = "vagrant"
config.vm.provider :libvirt do |libvirt| config.vm.provider :libvirt do |libvirt|