kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-20 13:50:12 +01:00
Code Activity

Allow buildserver CPU count to be configured

Browse Source
This commit is contained in:
Ciaran Gultnieks 2015-02-01 09:00:04 +00:00
parent d3f8a9f276
commit b71433e66b
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/makebs.config.py
View File

@ -11,8 +11,12 @@ basebox = "testing32"
# you can use this default if you like... # you can use this default if you like...
baseboxurl = "https://f-droid.org/testing32.box" baseboxurl = "https://f-droid.org/testing32.box"
# The amount of RAM the build server will have
memory = 3584 memory = 3584
# The number of CPUs the build server will have
cpus = 1
# Debian package proxy server - if you have one, e.g. "http://192.168.0.19:8000" # Debian package proxy server - if you have one, e.g. "http://192.168.0.19:8000"
aptproxy = None aptproxy = None

6
makebuildserver
View File

@ -163,10 +163,14 @@ Vagrant.configure("2") do |config|
config.vm.provider "virtualbox" do |v| config.vm.provider "virtualbox" do |v|
v.customize ["modifyvm", :id, "--memory", "{2}"] v.customize ["modifyvm", :id, "--memory", "{2}"]
v.customize ["modifyvm", :id, "--cpus", "{3}"]
end end
config.vm.provision :shell, :path => "fixpaths.sh" config.vm.provision :shell, :path => "fixpaths.sh"
""".format(config['basebox'], config['baseboxurl'], config['memory']) """.format(config['basebox'],
config['baseboxurl'],
config['memory'],
config['cpus'] or 1)
if 'aptproxy' in config and config['aptproxy']: if 'aptproxy' in config and config['aptproxy']:
vagrantfile += """ vagrantfile += """
config.vm.provision :shell, :inline => 'sudo echo "Acquire::http {{ Proxy \\"{0}\\"; }};" > /etc/apt/apt.conf.d/02proxy && sudo apt-get update' config.vm.provision :shell, :inline => 'sudo echo "Acquire::http {{ Proxy \\"{0}\\"; }};" > /etc/apt/apt.conf.d/02proxy && sudo apt-get update'