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

leave VirtualBox vagrant package as it was originally

Browse source 
We only need Vagrantfile hacks for KVM.
This commit is contained in:
Hans-Christoph Steiner 2017-05-22 15:50:32 +02:00
parent 8f1fabfed6
commit 9ef936c21a
2 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

20
makebuildserver
View file

@ -30,7 +30,8 @@ parser.add_option('--skip-cache-update', action="store_true", default=False,
help="""Skip downloading and checking cache."""
"""This assumes that the cache is already downloaded completely.""")
parser.add_option('--keep-box-file', action="store_true", default=False,
help="""Box file will not be deleted after adding it to box storage.""")
help="""Box file will not be deleted after adding it to box storage"""
""" (KVM-only).""")
options, args = parser.parse_args()
logger = logging.getLogger('fdroidserver-makebuildserver')
@ -536,22 +537,7 @@ def main():
if os.path.exists(boxfile):
os.remove(boxfile)
vagrantfile = textwrap.dedent("""\
Vagrant.configure("2") do |config|
config.ssh.username = "vagrant"
config.ssh.password = "vagrant"
config.vm.provider :libvirt do |libvirt|
libvirt.driver = "kvm"
libvirt.host = ""
libvirt.connect_via_ssh = false
libvirt.storage_pool_name = "default"
end
end""")
vm.package(output=boxfile, vagrantfile=vagrantfile, keep_box_file=options.keep_box_file)
vm.package(output=boxfile)
logger.info("Adding box")
vm.box_add('buildserver', boxfile, force=True)