mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-18 19:20:08 +02:00
deal with outdated box images in libvirt storage pool
This commit is contained in:
parent
b01d48a4fd
commit
1b1d6b7d96
@ -173,7 +173,7 @@ class FDroidBuildVm():
|
|||||||
self.vgrnt.destroy()
|
self.vgrnt.destroy()
|
||||||
logger.debug('vagrant destroy completed')
|
logger.debug('vagrant destroy completed')
|
||||||
except subprocess.CalledProcessError as e:
|
except subprocess.CalledProcessError as e:
|
||||||
logger.debug('vagrant destroy failed: %s', e)
|
logger.exception('vagrant destroy failed: %s', e)
|
||||||
vgrntdir = joinpath(self.srvdir, '.vagrant')
|
vgrntdir = joinpath(self.srvdir, '.vagrant')
|
||||||
try:
|
try:
|
||||||
shutil.rmtree(vgrntdir)
|
shutil.rmtree(vgrntdir)
|
||||||
@ -325,12 +325,22 @@ class LibvirtBuildVm(FDroidBuildVm):
|
|||||||
logger.warn('could not connect to storage-pool \'default\',' +
|
logger.warn('could not connect to storage-pool \'default\',' +
|
||||||
'skipping packaging buildserver box')
|
'skipping packaging buildserver box')
|
||||||
|
|
||||||
|
def box_add(self, boxname, boxfile, force=True):
|
||||||
|
boximg = '%s_vagrant_box_image_0.img' % (boxname)
|
||||||
|
if force:
|
||||||
|
try:
|
||||||
|
_check_call(['virsh', '-c', 'qemu:///system', 'vol-delete', '--pool', 'default', boximg])
|
||||||
|
logger.debug("removed old box image '%s' from libvirt storeage pool", boximg)
|
||||||
|
except subprocess.CalledProcessError as e:
|
||||||
|
logger.debug("tired removing old box image '%s', file was not present in first place", boximg, exc_info=e)
|
||||||
|
super().box_add(boxname, boxfile, force)
|
||||||
|
|
||||||
def box_remove(self, boxname):
|
def box_remove(self, boxname):
|
||||||
super().box_remove(boxname)
|
super().box_remove(boxname)
|
||||||
try:
|
try:
|
||||||
_check_call(['virsh', '-c', 'qemu:///system', 'vol-delete', '--pool', 'default', '%s_vagrant_box_image_0.img' % (boxname)])
|
_check_call(['virsh', '-c', 'qemu:///system', 'vol-delete', '--pool', 'default', '%s_vagrant_box_image_0.img' % (boxname)])
|
||||||
except subprocess.CalledProcessError as e:
|
except subprocess.CalledProcessError as e:
|
||||||
logger.info('tired removing \'%s\', file was not present in first place: %s', boxname, e)
|
logger.debug("tired removing '%s', file was not present in first place", boxname, exc_info=e)
|
||||||
|
|
||||||
def snapshot_create(self, snapshot_name):
|
def snapshot_create(self, snapshot_name):
|
||||||
logger.info("creating snapshot '%s' for vm '%s'", snapshot_name, self.srvname)
|
logger.info("creating snapshot '%s' for vm '%s'", snapshot_name, self.srvname)
|
||||||
|
Loading…
Reference in New Issue
Block a user