mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-11-15 11:20:32 +01:00
delete associated libvirt domain/image when destroying builder vm
This commit is contained in:
parent
fad98eeb7f
commit
34cddd3be8
@ -220,6 +220,25 @@ def get_clean_vm(reset=False):
|
|||||||
if os.path.exists('builder'):
|
if os.path.exists('builder'):
|
||||||
logging.info("Removing broken/incomplete/unwanted build server")
|
logging.info("Removing broken/incomplete/unwanted build server")
|
||||||
vagrant(['destroy', '-f'], cwd='builder')
|
vagrant(['destroy', '-f'], cwd='builder')
|
||||||
|
if provider == 'libvirt':
|
||||||
|
import libvirt
|
||||||
|
virConnect = None
|
||||||
|
virDomain = None
|
||||||
|
try:
|
||||||
|
virConnect = libvirt.open('qemu:///system')
|
||||||
|
virDomain = virConnect.lookupByName('builder_default')
|
||||||
|
except libvirt.libvirtError:
|
||||||
|
logging.debug("no libvirt domain found, skipping delete attempt")
|
||||||
|
if virDomain:
|
||||||
|
virDomain.undefineFlags(libvirt.VIR_DOMAIN_UNDEFINE_MANAGED_SAVE
|
||||||
|
| libvirt.VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA
|
||||||
|
| libvirt.VIR_DOMAIN_UNDEFINE_NVRAM)
|
||||||
|
if virConnect:
|
||||||
|
storagePool = virConnect.storagePoolLookupByName('default')
|
||||||
|
if storagePool:
|
||||||
|
for vol in storagePool.listAllVolumes():
|
||||||
|
if vol.name().startswith('builder'):
|
||||||
|
vol.delete()
|
||||||
shutil.rmtree('builder')
|
shutil.rmtree('builder')
|
||||||
os.mkdir('builder')
|
os.mkdir('builder')
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user