mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 22:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

makebuildserver use virsh instead of libvirt for forcing domain off

Browse source
This commit is contained in:
Michael Pöhn 2017-03-25 02:19:15 +01:00 • committed by Hans-Christoph Steiner
parent 8e5446068b
commit 70a827d59a
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
makebuildserver
View file

@ -344,14 +344,15 @@ def destroy_current_image(v, serverdir):
try: try:
dom = conn.lookupByName(config['domain']) dom = conn.lookupByName(config['domain'])
try: try:
dom.destroy() logger.debug('virsh -c qemu:///system destroy %s', config['domain'])
except libvirt.libvirtError as e: subprocess.check_call(['virsh', '-c', 'qemu:///system', 'destroy', config['domain']])
logging.info("could not force libvirt domain '%s' off: %s", dom.name(), e) except subprocess.CalledProcessError as e:
# libvirt python bindings do not support all flags required logging.info("could not force libvirt domain '%s' off: %s", config['domain'], e)
# for undefining domains correctly.
try: try:
logger.debug('virsh -c qemu:///system undefine builder_defaul --nvram --managed-save --remove-all-storage --snapshots-metadata') # libvirt python bindings do not support all flags required
subprocess.check_call(('virsh', '-c', 'qemu:///system', 'undefine', 'builder_default', '--nvram', '--managed-save', '--remove-all-storage', '--snapshots-metadata')) # for undefining domains correctly.
logger.debug('virsh -c qemu:///system undefine %s --nvram --managed-save --remove-all-storage --snapshots-metadata', config['domain'])
subprocess.check_call(('virsh', '-c', 'qemu:///system', 'undefine', config['domain'], '--nvram', '--managed-save', '--remove-all-storage', '--snapshots-metadata'))
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
logger.info("could not undefine libvirt domain '%s': %s", dom.name(), e) logger.info("could not undefine libvirt domain '%s': %s", dom.name(), e)
except libvirt.libvirtError as e: except libvirt.libvirtError as e:
@ -574,7 +575,6 @@ def main():
logger.info("Configuring build server VM") logger.info("Configuring build server VM")
debug_log_vagrant_vm(serverdir, 'buildserver_default') debug_log_vagrant_vm(serverdir, 'buildserver_default')
try: try:
#subprocess.check_call(['vagrant', 'up', '--provision'], pwd=serverdir)
v.up(provision=True) v.up(provision=True)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
debug_log_vagrant_vm(serverdir, 'buildserver_default') debug_log_vagrant_vm(serverdir, 'buildserver_default')