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

build: destroy vm after each build

Browse source
This commit is contained in:
mimi89999 2020-10-31 10:55:14 +01:00
parent 3e35b2dd27
commit 5485869e3f
No known key found for this signature in database
GPG key ID: 4B054AC4922D7B18
2 changed files with 7 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fdroidserver/build.py
View file

@ -74,7 +74,7 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
else: else:
logging.getLogger("paramiko").setLevel(logging.WARN) logging.getLogger("paramiko").setLevel(logging.WARN)
sshinfo = vmtools.get_clean_builder('builder', options.reset_server) sshinfo = vmtools.get_clean_builder('builder')
output = None output = None
try: try:
@ -295,7 +295,8 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
finally: finally:
# Suspend the build server. # Suspend the build server.
vm = vmtools.get_build_vm('builder') vm = vmtools.get_build_vm('builder')
vm.suspend() logging.info('destroying buildserver after build')
vm.destroy()
# deploy logfile to repository web server # deploy logfile to repository web server
if output: if output:

25
fdroidserver/vmtools.py
View file

@ -33,7 +33,7 @@ import threading
lock = threading.Lock() lock = threading.Lock()
def get_clean_builder(serverdir, reset=False): def get_clean_builder(serverdir):
if not os.path.isdir(serverdir): if not os.path.isdir(serverdir):
if os.path.islink(serverdir): if os.path.islink(serverdir):
os.unlink(serverdir) os.unlink(serverdir)
@ -51,26 +51,9 @@ def get_clean_builder(serverdir, reset=False):
end end
""")) """))
vm = get_build_vm(serverdir) vm = get_build_vm(serverdir)
if reset: logging.info('destroying buildserver before build')
logging.info('resetting buildserver by request') vm.destroy()
elif not vm.vagrant_uuid_okay(): logging.info('starting buildserver')
logging.info('resetting buildserver, because vagrant vm is not okay.')
reset = True
elif not vm.snapshot_exists('fdroidclean'):
logging.info("resetting buildserver, because snapshot 'fdroidclean' is not present.")
reset = True
if reset:
vm.destroy()
vm.up()
vm.suspend()
if reset:
logging.info('buildserver recreated: taking a clean snapshot')
vm.snapshot_create('fdroidclean')
else:
logging.info('builserver ok: reverting to clean snapshot')
vm.snapshot_revert('fdroidclean')
vm.up() vm.up()
try: try: