kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-20 13:50:12 +01:00
Code Activity

fdroid build: added sleep after destroy/undefine

Browse Source
This commit is contained in:
Michael Pöhn 2017-03-25 04:19:36 +01:00 committed by Hans-Christoph Steiner
parent 718d01dea2
commit fb03e17849
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdroidserver/build.py
View File

@ -359,7 +359,11 @@ def vm_destroy_builder(provider):
shutil.rmtree('builder') shutil.rmtree('builder')
# get rid of vm and related disk images # get rid of vm and related disk images
FDroidPopen(('virsh', '-c', 'qemu:///system', 'destroy', 'builder_default')) FDroidPopen(('virsh', '-c', 'qemu:///system', 'destroy', 'builder_default'))
logging.info("...waiting a sec...")
time.sleep(10)
FDroidPopen(('virsh', '-c', 'qemu:///system', 'undefine', 'builder_default', '--nvram', '--managed-save', '--remove-all-storage', '--snapshots-metadata')) FDroidPopen(('virsh', '-c', 'qemu:///system', 'undefine', 'builder_default', '--nvram', '--managed-save', '--remove-all-storage', '--snapshots-metadata'))
logging.info("...waiting a sec...")
time.sleep(10)
# Note that 'force' here also implies test mode. # Note that 'force' here also implies test mode.

12
makebuildserver
View File

@ -349,23 +349,23 @@ def destroy_current_image(v, serverdir):
try: try:
logger.debug('virsh -c qemu:///system destroy %s', config['domain']) logger.debug('virsh -c qemu:///system destroy %s', config['domain'])
subprocess.check_call(['virsh', '-c', 'qemu:///system', 'destroy', config['domain']]) subprocess.check_call(['virsh', '-c', 'qemu:///system', 'destroy', config['domain']])
logging.info("...waiting a sec...") logger.info("...waiting a sec...")
time.sleep(10) time.sleep(10)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
logging.info("could not force libvirt domain '%s' off: %s", config['domain'], e) logger.info("could not force libvirt domain '%s' off: %s", config['domain'], e)
try: try:
# libvirt python bindings do not support all flags required # libvirt python bindings do not support all flags required
# for undefining domains correctly. # for undefining domains correctly.
logger.debug('virsh -c qemu:///system undefine %s --nvram --managed-save --remove-all-storage --snapshots-metadata', config['domain']) 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')) subprocess.check_call(('virsh', '-c', 'qemu:///system', 'undefine', config['domain'], '--nvram', '--managed-save', '--remove-all-storage', '--snapshots-metadata'))
logging.info("...waiting a sec...") logger.info("...waiting a sec...")
time.sleep(10) time.sleep(10)
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:
logging.info("finding libvirt domain '%s' failed. (%s)", config['domain'], e) logger.info("finding libvirt domain '%s' failed. (%s)", config['domain'], e)
except libvirt.libvirtError as e: except libvirt.libvirtError as e:
logging.critical('could not connect to libvirtd: %s', e) logger.critical('could not connect to libvirtd: %s', e)
sys.exit(1) sys.exit(1)
@ -588,7 +588,7 @@ def main():
v.up(provision=True) v.up(provision=True)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
debug_log_vagrant_vm(serverdir, config['domain']) debug_log_vagrant_vm(serverdir, config['domain'])
logging.critical('could not bring buildserver vm up. %s', e) logger.critical('could not bring buildserver vm up. %s', e)
sys.exit(1) sys.exit(1)
if config['copy_caches_from_host']: if config['copy_caches_from_host']: