mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-03 17:50:11 +02:00
use configured vm provider in when calling destroy in makebuildserver
This commit is contained in:
parent
a414aa00ff
commit
4347c10d9d
@ -47,7 +47,7 @@ def get_build_vm(srvdir, provider=None):
|
||||
logger.debug('build vm provider \'virtualbox\' selected')
|
||||
return VirtualboxBuildVm(abssrvdir)
|
||||
else:
|
||||
logger.warn('unsupported provider \'%s\' requested', provider)
|
||||
logger.warn('build vm provider not supported: \'%s\'', provider)
|
||||
has_libvirt_machine = isdir(joinpath(abssrvdir, '.vagrant',
|
||||
'machines', 'default', 'libvirt'))
|
||||
has_vbox_machine = isdir(joinpath(abssrvdir, '.vagrant',
|
||||
|
@ -483,7 +483,7 @@ def main():
|
||||
tail = fdroidserver.tail.Tail(logfilename)
|
||||
tail.start()
|
||||
|
||||
vm = fdroidserver.vmtools.get_build_vm(serverdir)
|
||||
vm = fdroidserver.vmtools.get_build_vm(serverdir, provider=config['vm_provider'])
|
||||
if options.clean:
|
||||
vm.destroy()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user