kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-02 17:20:25 +02:00
Code Activity

makebuildserver: add config options for disk and network hardware emulation

Browse Source
This commit is contained in:
Michael Pöhn 2018-10-11 11:30:46 +02:00
parent 2a9bc448ee
commit d98d90ab90
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildserver/Vagrantfile vendored
View File

@ -34,6 +34,8 @@ Vagrant.configure("2") do |config|
libvirt.uri = "qemu:///system" libvirt.uri = "qemu:///system"
libvirt.cpus = configfile["cpus"] libvirt.cpus = configfile["cpus"]
libvirt.memory = configfile["memory"] libvirt.memory = configfile["memory"]
libvirt.disk_bus = configfile["libvirt_disk_bus"]
libvirt.nic_model_type = configfile["libvirt_nic_model_type"]
end end
config.vm.synced_folder './', '/vagrant', type: '9p' config.vm.synced_folder './', '/vagrant', type: '9p'
synced_folder_type = '9p' synced_folder_type = '9p'

8
examples/makebuildserver.config.py
View File

@ -63,3 +63,11 @@
# below: # below:
# #
# vm_provider = 'libvirt' # vm_provider = 'libvirt'
# By default libvirt uses 'virtio' for both network and disk drivers.
# Some systems (eg. nesting VMware ESXi) do not support virtio. As a
# workaround for such rare cases, this setting allows to configure
# KVM/libvirt to emulate hardware rather than using virtio.
#
# libvirt_disk_bus = 'sata'
# libvirt_nic_model_type = 'rtl8139'

2
makebuildserver
View File

@ -65,6 +65,8 @@ config = {
'memory': 2048, 'memory': 2048,
'hwvirtex': 'off', 'hwvirtex': 'off',
'vm_provider': 'virtualbox', 'vm_provider': 'virtualbox',
'libvirt_disk_bus': 'virtio',
'libvirt_nic_model_type': 'virtio',
} }
if os.path.isfile('/usr/bin/systemd-detect-virt'): if os.path.isfile('/usr/bin/systemd-detect-virt'):