kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-09-15 17:50:10 +02:00
Code Activity

reset buildserver vm if vagrant uuid not present

Browse Source
This commit is contained in:
Michael Pöhn 2017-04-13 18:41:50 +02:00 committed by Hans-Christoph Steiner
parent 510efaa024
commit 48159f005a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fdroidserver/build.py
View File

@ -242,8 +242,11 @@ def vm_new_get_clean_builder(serverdir, reset=False):
vm = vmtools.get_build_vm(serverdir)
if reset:
logging.info('resetting buildserver by request')
elif not vm.vagrant_uuid_okay():
logging.info('resetting buildserver, bceause vagrant vm is not okay.')
reset = True
elif not vm.snapshot_exists('fdroidclean'):
logging.info("resetting buildserver, because snapshot 'fdroidclean' is not present")
logging.info("resetting buildserver, because snapshot 'fdroidclean' is not present.")
reset = True
if reset:

6
fdroidserver/vmtools.py
View File

@ -184,6 +184,12 @@ class FDroidBuildVm():
def package(self, output=None, vagrantfile=None, keep_box_file=None):
self.vgrnt.package(output=output, vagrantfile=vagrantfile)
def vagrant_uuid_okay(self):
'''Having an uuid means that vagrant up has run successfully.'''
if self.srvuuid is None:
return False
return True
def _vagrant_file_name(self, name):
return name.replace('/', '-VAGRANTSLASH-')