1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-19 21:30:10 +01:00

makebuildserver debug logging when initial provisioning fails

This commit is contained in:
Michael Pöhn 2017-03-25 01:56:20 +01:00 committed by Hans-Christoph Steiner
parent 16b609215e
commit 8e5446068b

View File

@ -353,7 +353,7 @@ def destroy_current_image(v, serverdir):
logger.debug('virsh -c qemu:///system undefine builder_defaul --nvram --managed-save --remove-all-storage --snapshots-metadata') logger.debug('virsh -c qemu:///system undefine builder_defaul --nvram --managed-save --remove-all-storage --snapshots-metadata')
subprocess.check_call(('virsh', '-c', 'qemu:///system', 'undefine', 'builder_default', '--nvram', '--managed-save', '--remove-all-storage', '--snapshots-metadata')) subprocess.check_call(('virsh', '-c', 'qemu:///system', 'undefine', 'builder_default', '--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:
logging.info("finding libvirt domain '%s' failed. (%s)", config['domain'], e) logging.info("finding libvirt domain '%s' failed. (%s)", config['domain'], e)
except libvirt.libvirtError as e: except libvirt.libvirtError as e:
@ -573,8 +573,13 @@ 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')
v.up(provision=True) try:
debug_log_vagrant_vm(serverdir, 'buildserver_default') #subprocess.check_call(['vagrant', 'up', '--provision'], pwd=serverdir)
v.up(provision=True)
except subprocess.CalledProcessError as e:
debug_log_vagrant_vm(serverdir, 'buildserver_default')
logging.critical('could not bring buildserver vm up. %s', e)
sys.exit(1)
if config['copy_caches_from_host']: if config['copy_caches_from_host']:
ssh_config = v.ssh_config() ssh_config = v.ssh_config()