mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-11-04 22:40:29 +03:00
Merge branch 'verifiy-basebox' into 'master'
* verifiy-basebox: jenkins: switch to using auto-downloaded and verified basebox makebuildserver: verify stretch basebox fdroid/fdroidserver!581
This commit is contained in:
commit
92bf9315e6
4 changed files with 118 additions and 5 deletions
4
buildserver/Vagrantfile
vendored
4
buildserver/Vagrantfile
vendored
|
|
@ -16,7 +16,9 @@ Vagrant.configure("2") do |config|
|
|||
end
|
||||
|
||||
config.vm.box = configfile['basebox']
|
||||
config.vm.box_url = configfile['baseboxurl']
|
||||
if configfile.has_key? "basebox_version"
|
||||
config.vm.box_version = configfile['basebox_version']
|
||||
end
|
||||
|
||||
if not configfile.has_key? "vm_provider" or configfile["vm_provider"] == "virtualbox"
|
||||
# default to VirtualBox if not set
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue