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

restart builder vm when ssh connection fails

Browse source
This commit is contained in:
Michael Pöhn 2017-04-25 14:45:41 +02:00 • committed by Hans-Christoph Steiner
parent 6106b962a2
commit 8f1fabfed6
2 changed files with 38 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
fdroidserver/build.py
View file

@ -41,6 +41,7 @@ from . import scanner
from . import vmtools
from .common import FDroidPopen, SdkToolsPopen
from .exception import FDroidException, BuildException, VCSException
from .vmtools import FDroidBuildVmException
try:
import paramiko
@ -264,7 +265,16 @@ def vm_new_get_clean_builder(serverdir, reset=False):
vm.snapshot_revert('fdroidclean')
vm.up()
return get_vagrant_sshinfo()
try:
sshinfo = vm.sshinfo()
except FDroidBuildVmException:
# workaround because libvirt sometimes likes to forget
# about ssh connection info even thou the vm is running
vm.halt()
vm.up()
sshinfo = vm.sshinfo()
return sshinfo
def vm_get_clean_builder(reset=False):