From 3629437b098dceaf068985af54bee7a2acfd6237 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Tue, 26 Jan 2016 22:01:28 +0000 Subject: [PATCH] Tidy up/fix some vagrant issues 1. It is packaged in modern versions of distros, update docs accordingly 2. 1.1 is hopelessly outdated - support 1.4 onwards 3. Check the version properly, and write a better config (previously it wrote the 1.1 config for 1.1 and 1.3+ 4. Ensure that the default share from later versions is not present when building, it's only required for provisioning. --- docs/fdroid.texi | 2 +- fdroidserver/build.py | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/docs/fdroid.texi b/docs/fdroid.texi index e57b4a12..96545d73 100644 --- a/docs/fdroid.texi +++ b/docs/fdroid.texi @@ -117,7 +117,7 @@ VirtualBox (debian package virtualbox) @item Ruby (debian packages ruby and rubygems) @item -Vagrant (unpackaged, tested on v1.4.3) +Vagrant (debian package vagrant - 1.4.x or higher required) @item vagrant-cachier plugin (unpackaged): `vagrant plugin install vagrant-cachier` @item diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 463e6057..021e1041 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -178,16 +178,15 @@ def get_clean_vm(reset=False): p = subprocess.Popen(['vagrant', '--version'], stdout=subprocess.PIPE) - vver = p.communicate()[0] + vver = p.communicate()[0].strip().split(' ')[1] + if vver.split('.')[0] != '1' or int(vver.split('.')[1]) < 4: + raise BuildException("Unsupported vagrant version {0}".format(vver)) + with open(os.path.join('builder', 'Vagrantfile'), 'w') as vf: - if vver.startswith('Vagrant version 1.2'): - vf.write('Vagrant.configure("2") do |config|\n') - vf.write('config.vm.box = "buildserver"\n') - vf.write('end\n') - else: - vf.write('Vagrant::Config.run do |config|\n') - vf.write('config.vm.box = "buildserver"\n') - vf.write('end\n') + vf.write('Vagrant.configure("2") do |config|\n') + vf.write('config.vm.box = "buildserver"\n') + vf.write('config.vm.synced_folder ".", "/vagrant", disabled: true\n') + vf.write('end\n') logging.info("Starting new build server") retcode, _ = vagrant(['up'], cwd='builder') -- 2.30.2