Commit 06438fff authored by Michael Pöhn's avatar Michael Pöhn

rename output images to basebox

parent 3fbb6bf2
fdroid-jessie64-libvirt.box
fdroid-jessie64-virtualbox.box
fdroid-stretch64-libvirt.box
fdroid-stretch64-virtualbox.box
basebox-jessie64-libvirt.box
basebox-jessie64-virtualbox.box
basebox-stretch64-libvirt.box
basebox-stretch64-virtualbox.box
debootstrap.log
tests/extra/test-libvirt/.vagrant
......
......@@ -27,18 +27,18 @@ This section describes the primary intended use case for
#### Bootstrap and add box:
sudo ./fdroid_basebox.py --provider libvirt
vagrant box add fdroid-stretch64 fdroid-stretch64-libvirt.box
vagrant box add basebox-stretch64 basebox-stretch64-libvirt.box
That's it, _makebuildserver_ should be able to find the basebox now.
If you are upgrading form jessie64 make sure `basebox = ...` is not used
to override automatic basebox selection in _makebuildserver.config.py_.
You can either delete that line or set it to `basebox = "fdroid-stretch64"`
You can either delete that line or set it to `basebox = "basebox-stretch64"`
if you've added our basebox as described above.
#### (optional) cleanup:
rm fdroid-jessie64-libvirt.box
rm basebox-stretch64-libvirt.box
### synopsis
......
......@@ -50,10 +50,10 @@ def vm_size_str_to_bytes(size):
def init_params(provider, debver, workdir='.', verbose=False, dry_run=False):
"""creates dict with carefully chosen parameters for buildservers"""
params = {'vm_name': 'fdroid-{}'.format(debver),
'hostname': 'fdroid-buildserver',
'vm_ram': 2048,
'vm_cpu': 2,
params = {'vm_name': 'basebox-{}'.format(debver),
'hostname': 'basebox-{}'.format(debver),
'vm_ram': 1024,
'vm_cpu': 1,
'size': '1000G',
'deb_mirror': 'http://deb.debian.org/debian',
'deb_distro': debver[:-2],
......@@ -62,7 +62,7 @@ def init_params(provider, debver, workdir='.', verbose=False, dry_run=False):
'fdroidserver-customize.sh'),
'username': 'vagrant',
'password': 'vagrant',
'boxfile': 'fdroid-{debver}-{provider}.box'.format(
'boxfile': 'basebox-{debver}-{provider}.box'.format(
debver=debver, provider=provider),
'verbose': verbose,
'dry_run': dry_run}
......
Vagrant.configure("2") do |config|
config.vm.box = "fdroid-stretch64"
#config.vm.box = "fdroid-jessie64"
config.vm.box = "basebox-stretch64"
#config.vm.box = "basebox-jessie64"
config.vm.provider :libvirt do |libvirt|
libvirt.driver = "kvm"
......
Vagrant.configure("2") do |config|
config.vm.box = "fdroid-jessie64"
#config.vm.box = "fdroid-stretch64"
config.vm.box = "basebox-jessie64"
#config.vm.box = "basebox-stretch64"
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment