convert examples/makebuildserver.config.py to Vagrantfile.yaml

Also, tests/androguard_test.py was removed long ago

.gitlab-ci.yml

@@ -223,7 +223,6 @@ black:
     - pip install black
     - black --check --diff --color
         examples/fdroid_extract_repo_pubkey.py
-        examples/makebuildserver.config.py
         fdroid
         fdroidserver/btlog.py
         fdroidserver/exception.py

MANIFEST.in

@@ -14,10 +14,10 @@ include examples/fdroid_export_keystore_to_nitrokey.py
 include examples/fdroid_extract_repo_pubkey.py
 include examples/fdroid_fetchsrclibs.py
 include examples/fdroid_nitrokeyimport.py
-include examples/makebuildserver.config.py
 include examples/opensc-fdroid.cfg
 include examples/public-read-only-s3-bucket-policy.json
 include examples/template.yml
+include examples/Vagrantfile.yaml
 include gradlew-fdroid
 include LICENSE
 include locale/bo/LC_MESSAGES/fdroidserver.po
@@ -42,7 +42,6 @@ include locale/zh_Hans/LC_MESSAGES/fdroidserver.po
 include locale/zh_Hant/LC_MESSAGES/fdroidserver.po
 include makebuildserver
 include README.md
-include tests/androguard_test.py
 include tests/apk.embedded_1.apk
 include tests/bad-unicode-*.apk
 include tests/build.TestCase

buildserver/Vagrantfile

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'pathname'
+require 'fileutils'
 
 configfile = {
   'boot_timeout' => 600,
@@ -14,9 +15,15 @@ configfile = {
 srvpath = Pathname.new(File.dirname(__FILE__)).realpath
 configpath = File.join(srvpath, "/Vagrantfile.yaml")
 if File.exists? configpath
-  YAML.load_file(configpath).each do |k,v|
+  c = YAML.load_file(configpath)
-    configfile[k] = v
+  if c and not c.empty?
+    c.each do |k,v|
+      configfile[k] = v
+    end
   end
+else
+  puts "Copying example file to #{configpath}"
+  FileUtils.cp('../examples/Vagrantfile.yaml', configpath)
 end
 
 Vagrant.configure("2") do |config|

examples/Vagrantfile.yaml

@@ -1,5 +1,4 @@
-#!/usr/bin/env python3
+
-#
 # You may want to alter these before running ./makebuildserver
 
 # In the process of setting up the build server, many gigs of files
@@ -7,28 +6,28 @@
 # cached so that they are not redownloaded each time. By default,
 # these are stored in ~/.cache/fdroidserver
 #
-# cachedir = 'buildserver/cache'
+# cachedir: buildserver/cache
 
 # To specify which Debian mirror the build server VM should use, by
 # default it uses http.debian.net, which auto-detects which is the
 # best mirror to use.
 #
-# debian_mirror = 'http://ftp.uk.debian.org/debian/'
+# debian_mirror: https://debian.osuosl.org/debian/
 
 # The amount of RAM the build server will have (default: 2048)
-# memory = 3584
+# memory: 3584
 
 # The number of CPUs the build server will have
-# cpus = 1
+# cpus: 1
 
 # Debian package proxy server - if you have one
-# aptproxy = "http://192.168.0.19:8000"
+# aptproxy: http://192.168.0.19:8000
 
 # If this is running on an older machine or on a virtualized system,
 # it can run a lot slower. If the provisioning fails with a warning
 # about the timeout, extend the timeout here. (default: 600 seconds)
 #
-# boot_timeout = 1200
+# boot_timeout: 1200
 
 # By default, this whole process uses VirtualBox as the provider, but
 # QEMU+KVM is also supported via the libvirt plugin to vagrant. If
@@ -36,19 +35,19 @@
 # automatically.  It can also be manually enabled by uncommenting
 # below:
 #
-# vm_provider = 'libvirt'
+# vm_provider: libvirt
 
 # By default libvirt uses 'virtio' for both network and disk drivers.
 # Some systems (eg. nesting VMware ESXi) do not support virtio. As a
 # workaround for such rare cases, this setting allows to configure
 # KVM/libvirt to emulate hardware rather than using virtio.
 #
-# libvirt_disk_bus = 'sata'
+# libvirt_disk_bus: sata
-# libvirt_nic_model_type = 'rtl8139'
+# libvirt_nic_model_type: rtl8139
 
 # Sometimes, it is not possible to use the 9p synced folder type with
 # libvirt, like if running a KVM buildserver instance inside of a
 # VMware ESXi guest.  In that case, using NFS or another method is
 # required.
 #
-# synced_folder_type = 'nfs'
+# synced_folder_type: nfs