mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-19 11:30:15 +02:00
reset buildserver vm if vagrant uuid not present
This commit is contained in:
parent
510efaa024
commit
48159f005a
@ -242,8 +242,11 @@ def vm_new_get_clean_builder(serverdir, reset=False):
|
|||||||
vm = vmtools.get_build_vm(serverdir)
|
vm = vmtools.get_build_vm(serverdir)
|
||||||
if reset:
|
if reset:
|
||||||
logging.info('resetting buildserver by request')
|
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'):
|
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
|
reset = True
|
||||||
|
|
||||||
if reset:
|
if reset:
|
||||||
|
@ -184,6 +184,12 @@ class FDroidBuildVm():
|
|||||||
def package(self, output=None, vagrantfile=None, keep_box_file=None):
|
def package(self, output=None, vagrantfile=None, keep_box_file=None):
|
||||||
self.vgrnt.package(output=output, vagrantfile=vagrantfile)
|
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):
|
def _vagrant_file_name(self, name):
|
||||||
return name.replace('/', '-VAGRANTSLASH-')
|
return name.replace('/', '-VAGRANTSLASH-')
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user