From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Wed, 26 Aug 2015 12:44:36 +0000 (+0000)
Subject: Merge branch 'support-vagrant-cachier' into 'master'
X-Git-Tag: 0.5.0~180
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=99d0c55fe95a354bb1ba468339cec468a9c226b5

Merge branch 'support-vagrant-cachier' into 'master'

Add optional support for vagrant-cachier plugin

Building the basebox is excruciating for people on slow connections. I'm particularly sensitive to this after living in Central America for awhile :)

This won't affect anyone who hasn't installed the plugin. For those who do, it creates a persistent shared folder for each box (ie. testing23.box) and detects directories to cache between VM builds (apt, gems, pip, chef cache, etc.)

(The only downside is that, for those following server setup does who are not aware what vagrant-cachier does, it might be unexpected that artifacts persist between vagrant destroys.)

See merge request !25
---

99d0c55fe95a354bb1ba468339cec468a9c226b5
diff --cc docs/fdroid.texi
index 4e87eaf3,dacf6cc9..3ac3927c
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@@ -115,8 -113,11 +115,10 @@@ VirtualBox (debian package virtualbox
  @item
  Ruby (debian packages ruby and rubygems)
  @item
 -Vagrant (unpackaged) Be sure to use 1.3.x because 1.4.x is completely broken
 -(at the time of writing, the forthcoming 1.4.3 might work)
 +Vagrant (unpackaged, tested on v1.4.3)
  @item
+ vagrant-cachier plugin (unpackaged): `vagrant plugin install vagrant-cachier`
+ @item
  Paramiko (debian package python-paramiko)
  @item
  Imaging (debian package python-imaging)
diff --cc makebuildserver
index 5eba8049,1c9ef248..5b4862f3
--- a/makebuildserver
+++ b/makebuildserver
@@@ -168,8 -144,15 +168,15 @@@ for f, src, shasum in cachefiles
  # Generate an appropriate Vagrantfile for the buildserver, based on our
  # settings...
  vagrantfile = """
 -Vagrant::Config.run do |config|
 +Vagrant.configure("2") do |config|
  
+   if Vagrant.has_plugin?("vagrant-cachier")
+     config.cache.scope = :box
+     config.cache.auto_detect = false
+     config.cache.enable :apt
+     config.cache.enable :chef
+   end
+ 
    config.vm.box = "{0}"
    config.vm.box_url = "{1}"