From e960cdb2656262ea10762eb8f00de51ed4f54d6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ealden=20Esto=20E=2E=20Esca=C3=B1an?= Date: Thu, 5 Dec 2013 22:42:50 +0800 Subject: [PATCH 1/2] Use precise64 for all fixtures Should be easier to run the acceptance tests as we now only need to get 1 box instead of 2 before. --- spec/acceptance/fixtures/auto-detect-with-provisioning.rb | 2 +- spec/acceptance/fixtures/auto-detect.rb | 2 +- spec/acceptance/fixtures/no-cachier-simple.rb | 2 +- spec/acceptance/fixtures/no-cachier-with-provisioning.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/acceptance/fixtures/auto-detect-with-provisioning.rb b/spec/acceptance/fixtures/auto-detect-with-provisioning.rb index 79de78a..c69aad2 100644 --- a/spec/acceptance/fixtures/auto-detect-with-provisioning.rb +++ b/spec/acceptance/fixtures/auto-detect-with-provisioning.rb @@ -4,6 +4,6 @@ Vagrant.configure("2") do |config| config.cache.auto_detect = true config.cache.scope = :machine - config.vm.box = 'raring64' + config.vm.box = 'precise64' config.vm.provision :shell, inline: 'apt-get update && apt-get install -y git' end diff --git a/spec/acceptance/fixtures/auto-detect.rb b/spec/acceptance/fixtures/auto-detect.rb index 0027d7f..c04a23f 100644 --- a/spec/acceptance/fixtures/auto-detect.rb +++ b/spec/acceptance/fixtures/auto-detect.rb @@ -2,6 +2,6 @@ Vagrant.require_plugin 'vagrant-cachier' Vagrant.require_plugin 'vagrant-lxc' Vagrant.configure("2") do |config| config.cache.auto_detect = true - config.vm.box = 'quantal64' + config.vm.box = 'precise64' config.vm.provision :shell, inline: 'echo Hello!' end diff --git a/spec/acceptance/fixtures/no-cachier-simple.rb b/spec/acceptance/fixtures/no-cachier-simple.rb index ad2eff0..81ec9b0 100644 --- a/spec/acceptance/fixtures/no-cachier-simple.rb +++ b/spec/acceptance/fixtures/no-cachier-simple.rb @@ -1,5 +1,5 @@ Vagrant.require_plugin 'vagrant-cachier' Vagrant.require_plugin 'vagrant-lxc' Vagrant.configure("2") do |config| - config.vm.box = 'quantal64' + config.vm.box = 'precise64' end diff --git a/spec/acceptance/fixtures/no-cachier-with-provisioning.rb b/spec/acceptance/fixtures/no-cachier-with-provisioning.rb index 674ef25..dad0816 100644 --- a/spec/acceptance/fixtures/no-cachier-with-provisioning.rb +++ b/spec/acceptance/fixtures/no-cachier-with-provisioning.rb @@ -1,6 +1,6 @@ Vagrant.require_plugin 'vagrant-cachier' Vagrant.require_plugin 'vagrant-lxc' Vagrant.configure("2") do |config| - config.vm.box = 'quantal64' + config.vm.box = 'precise64' config.vm.provision :shell, inline: 'echo Hello!' end From 5e5070dc14be5de37f8fcacac40bcfb6b0df87c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ealden=20Esto=20E=2E=20Esca=C3=B1an?= Date: Thu, 5 Dec 2013 22:50:17 +0800 Subject: [PATCH 2/2] Vagrant should be able to download precise64 if we don't have it --- spec/acceptance/fixtures/auto-detect-with-provisioning.rb | 1 + spec/acceptance/fixtures/auto-detect.rb | 1 + spec/acceptance/fixtures/no-cachier-simple.rb | 1 + spec/acceptance/fixtures/no-cachier-with-provisioning.rb | 1 + 4 files changed, 4 insertions(+) diff --git a/spec/acceptance/fixtures/auto-detect-with-provisioning.rb b/spec/acceptance/fixtures/auto-detect-with-provisioning.rb index c69aad2..7ba1332 100644 --- a/spec/acceptance/fixtures/auto-detect-with-provisioning.rb +++ b/spec/acceptance/fixtures/auto-detect-with-provisioning.rb @@ -5,5 +5,6 @@ Vagrant.configure("2") do |config| config.cache.scope = :machine config.vm.box = 'precise64' + config.vm.box_url = 'http://files.vagrantup.com/precise64.box' config.vm.provision :shell, inline: 'apt-get update && apt-get install -y git' end diff --git a/spec/acceptance/fixtures/auto-detect.rb b/spec/acceptance/fixtures/auto-detect.rb index c04a23f..bd409a0 100644 --- a/spec/acceptance/fixtures/auto-detect.rb +++ b/spec/acceptance/fixtures/auto-detect.rb @@ -3,5 +3,6 @@ Vagrant.require_plugin 'vagrant-lxc' Vagrant.configure("2") do |config| config.cache.auto_detect = true config.vm.box = 'precise64' + config.vm.box_url = 'http://files.vagrantup.com/precise64.box' config.vm.provision :shell, inline: 'echo Hello!' end diff --git a/spec/acceptance/fixtures/no-cachier-simple.rb b/spec/acceptance/fixtures/no-cachier-simple.rb index 81ec9b0..c719a30 100644 --- a/spec/acceptance/fixtures/no-cachier-simple.rb +++ b/spec/acceptance/fixtures/no-cachier-simple.rb @@ -2,4 +2,5 @@ Vagrant.require_plugin 'vagrant-cachier' Vagrant.require_plugin 'vagrant-lxc' Vagrant.configure("2") do |config| config.vm.box = 'precise64' + config.vm.box_url = 'http://files.vagrantup.com/precise64.box' end diff --git a/spec/acceptance/fixtures/no-cachier-with-provisioning.rb b/spec/acceptance/fixtures/no-cachier-with-provisioning.rb index dad0816..8ee27fe 100644 --- a/spec/acceptance/fixtures/no-cachier-with-provisioning.rb +++ b/spec/acceptance/fixtures/no-cachier-with-provisioning.rb @@ -2,5 +2,6 @@ Vagrant.require_plugin 'vagrant-cachier' Vagrant.require_plugin 'vagrant-lxc' Vagrant.configure("2") do |config| config.vm.box = 'precise64' + config.vm.box_url = 'http://files.vagrantup.com/precise64.box' config.vm.provision :shell, inline: 'echo Hello!' end