Update Ubuntu Vagrant boxes used by Beaker

Use (seemingly better) boxcutter Ubuntu 14.04 box. Add Ubuntu 15.04 box. Note that the 15.04 Beaker tests are currently failing (see #63). Update Rake tasks accordingly. Signed-off-by: Daniel Farrell <[email protected]>
dfarrell07 · Aug 8, 2015 · 15f6678 · 15f6678
1 parent dfec141
commit 15f6678
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/Rakefile b/Rakefile
@@ -73,16 +73,23 @@ task :fedora_22 do
 end
 
 desc "Run Beaker tests against Ubuntu 14.04 node."
-task :ubuntu do
+task :ubuntu_1404 do
   sh "RS_SET=ubuntu-1404 INSTALL_METHOD=tarball bundle exec rake beaker"
 end
 
+desc "Run Beaker tests against Ubuntu 15.04 node."
+task :ubuntu_1504 do
+  sh "RS_SET=ubuntu-1504 INSTALL_METHOD=tarball bundle exec rake beaker"
+end
+
 desc "All tests, including Beaker tests against all nodes."
 task :acceptance => [
   :test,
   :centos,
   :centos_tarball,
   :fedora_20,
   :fedora_21,
-  :ubuntu,
+  :fedora_22,
+  :ubuntu_1404,
+  :ubuntu_1504,
 ]
diff --git a/spec/acceptance/nodesets/ubuntu-1404.yml b/spec/acceptance/nodesets/ubuntu-1404.yml
@@ -3,8 +3,8 @@ HOSTS:
     roles:
       - master
     platform: ubuntu-1404-amd64
-    box: puppetlabs/ubuntu-14.04-64-nocm
-    box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm
+    box: boxcutter/ubuntu1404
+    box_url: https://atlas.hashicorp.com/boxcutter/boxes/ubuntu1404
     hypervisor: vagrant
 
 CONFIG:

diff --git a/spec/acceptance/nodesets/ubuntu-1504.yml b/spec/acceptance/nodesets/ubuntu-1504.yml
@@ -0,0 +1,12 @@
+HOSTS:
+  ubuntu-1504:
+    roles:
+      - master
+    platform: ubuntu-1504-amd64
+    box: boxcutter/ubuntu1504
+    box_url: https://atlas.hashicorp.com/boxcutter/boxes/ubuntu1504
+    hypervisor: vagrant
+
+CONFIG:
+  log_level: verbose
+  type: foss