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

makebuildserver: settable vm boot timeout, plus longer default

Browse source 
On slow machines or VMs like the Debian jenkins box, the VM boot timeout
needs to be a lot longer, otherwise vagrant times out before setting up
the VM.
This commit is contained in:
Hans-Christoph Steiner 2016-01-26 17:35:25 +01:00
parent 3511c44357
commit 90d81eba2d
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
makebuildserver
View file

@ -54,6 +54,7 @@ config = {
'https://f-droid.org/jessie32.box',
],
'debian_mirror': 'http://http.debian.net/debian/',
'boot_timeout': 600,
'cachedir': cachedir,
'cpus': 1,
'memory': 3584,
@ -353,11 +354,14 @@ Vagrant.configure("2") do |config|
v.customize ["modifyvm", :id, "--cpus", "{3}"]
end
config.vm.boot_timeout = {4}
config.vm.provision :shell, :path => "fixpaths.sh"
""".format(config['basebox'],
baseboxurl,
config['memory'],
config.get('cpus', 1))
config.get('cpus', 1),
config['boot_timeout'])
if 'aptproxy' in config and config['aptproxy']:
vagrantfile += """
config.vm.provision :shell, :inline => 'sudo echo "Acquire::http {{ Proxy \\"{0}\\"; }};" > /etc/apt/apt.conf.d/02proxy && sudo apt-get update'