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

Merge branch 'vm-cpu-memory-status' into 'master'

Browse Source 
build: read VM CPUs/RAM from builder/Vagrantfile

See merge request fdroid/fdroidserver!1262
This commit is contained in:
Jochen Sprickerhof 2022-11-15 08:11:45 +00:00
commit 1562975bad
2 changed files with 13 additions and 2 deletions
Show Stats 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