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

Merge branch 'finalize-Vagrantfile.yaml' into 'master'

Browse Source 
makebuildserver: stop trying to write to Vagrantfile.yaml

See merge request fdroid/fdroidserver!1250
This commit is contained in:
Hans-Christoph Steiner 2022-11-04 10:47:30 +00:00
commit 166c28a7e7
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
makebuildserver
View File

@ -102,11 +102,11 @@ elif os.path.exists('makebs.config.py'):
# this is the old name for the config file # this is the old name for the config file
logging.error('makebs.config.py exists!') logging.error('makebs.config.py exists!')
if show_config_deprecation: if show_config_deprecation:
logging.error('Config is via buildserver/Vagrantfile.yaml and command line flags.') logging.error('Config is via %s and command line flags.' % configfile)
parser.print_help() parser.print_help()
exit(1) exit(1)
logging.debug("makebuildserver.config.py parsed -> %s", json.dumps(config, indent=4, sort_keys=True)) logging.debug("Vagrantfile.yaml parsed -> %s", json.dumps(config, indent=4, sort_keys=True))
# Update cached files. # Update cached files.
if not os.path.exists(config['cachedir']): if not os.path.exists(config['cachedir']):
@ -284,27 +284,6 @@ def main():
if options.clean: if options.clean:
vm.destroy() vm.destroy()
# Check against the existing Vagrantfile.yaml, and if they differ, we
# need to create a new box:
vf = os.path.join(serverdir, 'Vagrantfile.yaml')
writevf = True
if os.path.exists(vf):
logging.info('Halting %s', serverdir)
v.halt()
with open(vf, 'r', encoding='utf-8') as f:
oldconfig = yaml.safe_load(f)
if config != oldconfig:
logging.info("Server configuration has changed, rebuild from scratch is required")
vm.destroy()
else:
logging.info("Re-provisioning existing server")
writevf = False
else:
logging.info("No existing server - building from scratch")
if writevf:
with open(vf, 'w', encoding='utf-8') as f:
yaml.safe_dump(config, f)
# Check if selected provider is supported # Check if selected provider is supported
if config['vm_provider'] not in ['libvirt', 'virtualbox']: if config['vm_provider'] not in ['libvirt', 'virtualbox']:
logging.critical("Currently selected VM provider '{vm_provider}' " logging.critical("Currently selected VM provider '{vm_provider}' "