From bd51b2e99ff6bfa1bfcd442cc82aab4a626302cb Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 15 Nov 2022 08:50:23 +0100
Subject: [PATCH] build: read VM CPUs/RAM from builder/Vagrantfile

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
---
 fdroidserver/build.py     |  3 +--
 tests/builder/Vagrantfile | 12 ++++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 tests/builder/Vagrantfile

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index d441662b..206f5715 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -1277,8 +1277,7 @@ def main():
                     if m:
                         status_output['hostProcMeminfoMemTotal'] = m.group(1)
                         break
-        fdroid_path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))
-        buildserver_config = os.path.join(fdroid_path, 'makebuildserver.config.py')
+        buildserver_config = 'builder/Vagrantfile'
         if os.path.isfile(buildserver_config) and os.access(buildserver_config, os.R_OK):
             with open(buildserver_config) as configfile:
                 for line in configfile:
diff --git a/tests/builder/Vagrantfile b/tests/builder/Vagrantfile
new file mode 100644
index 00000000..376a19c7
--- /dev/null
+++ b/tests/builder/Vagrantfile
@@ -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