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

build: read VM CPUs/RAM from builder/Vagrantfile

Browse source 
makebuildserver.config.py is no more, builder/Vagrantfile is now where the
CPU and memory is configured for the buildserver VM.  In fact, that was
always the actual place, the makebuildserver.config.py thing was just
confused.

This should have been part of !1222
This commit is contained in:
Hans-Christoph Steiner 2022-11-15 08:50:23 +01:00
parent 5ea8c7da45
commit bd51b2e99f
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
fdroidserver/build.py
View file

@ -1277,8 +1277,7 @@ def main():
if m: if m:
status_output['hostProcMeminfoMemTotal'] = m.group(1) status_output['hostProcMeminfoMemTotal'] = m.group(1)
break break
fdroid_path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..')) buildserver_config = 'builder/Vagrantfile'
buildserver_config = os.path.join(fdroid_path, 'makebuildserver.config.py')
if os.path.isfile(buildserver_config) and os.access(buildserver_config, os.R_OK): if os.path.isfile(buildserver_config) and os.access(buildserver_config, os.R_OK):
with open(buildserver_config) as configfile: with open(buildserver_config) as configfile:
for line in configfile: for line in configfile:

12
tests/builder/Vagrantfile vendored Normal file
View file

@ -0,0 +1,12 @@
# generated file, do not change.
# https://gitlab.com/fdroid/fdroid-bootstrap-buildserver/-/blob/c0762bf9398d0/provision.yml#L552
Vagrant.configure("2") do |config|
config.vm.box = "buildserver"
config.vm.synced_folder ".", "/vagrant", disabled: true
config.vm.provider :libvirt do |libvirt|
libvirt.cpus = 24
libvirt.memory = 30720
end
end