Minor rename of gem group for clarity

[integration/packaging/puppet-opendaylight.git] / Rakefile

diff --git a/Rakefile b/Rakefile
index 3a6a0fc0bae74fa559ea1dc21cfa0d7c4f9734b9..2635a502e5f16fe1ac45528370b521575968a27e 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,6 @@
 # Temporary fix for error caused by third party gems. See:
 # https://github.com/maestrodev/puppet-blacksmith/issues/14
-# https://github.com/dfarrell07/dfarrell07-opendaylight/issues/6
+# https://github.com/dfarrell07/puppet-opendaylight/issues/6
 require 'puppet/version'
 require 'puppet/vendor/semantic/lib/semantic' unless Puppet.version.to_f <3.6
 
@@ -9,7 +9,7 @@ require 'puppet-lint/tasks/puppet-lint'
 require 'puppet-syntax/tasks/puppet-syntax'
 
 # These two gems aren't always present, for instance
-# on Travis with --without development
+# on Travis with `--without local_only`
 begin
   require 'puppet_blacksmith/rake_tasks'
 rescue LoadError
@@ -47,19 +47,49 @@ task :test => [
   :metadata,
 ]
 
-desc "Run Beaker tests CentOS 7 node."
+desc "Run Beaker tests against CentOS 7 node."
 task :centos do
-  sh "RS_SET=centos-7 bundle exec rake beaker"
+  sh "RS_SET=centos-7 INSTALL_METHOD=rpm bundle exec rake beaker"
 end
 
-desc "Run Beaker tests Fedora 20 node."
-task :fedora do
-  sh "RS_SET=fedora-20 bundle exec rake beaker"
+desc "Run Beaker tests against CentOS 7 using tarball install."
+task :centos_tarball do
+  sh "RS_SET=centos-7 INSTALL_METHOD=tarball bundle exec rake beaker"
+end
+
+desc "Run Beaker tests against Fedora 20 node."
+task :fedora_20 do
+  sh "RS_SET=fedora-20 INSTALL_METHOD=rpm bundle exec rake beaker"
+end
+
+desc "Run Beaker tests against Fedora 21 node."
+task :fedora_21 do
+  sh "RS_SET=fedora-21 INSTALL_METHOD=rpm bundle exec rake beaker"
+end
+
+desc "Run Beaker tests against Fedora 22 node."
+task :fedora_22 do
+  sh "RS_SET=fedora-22 INSTALL_METHOD=rpm bundle exec rake beaker"
+end
+
+desc "Run Beaker tests against Ubuntu 14.04 node."
+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,
-  :fedora,
+  :centos_tarball,
+  :fedora_20,
+  :fedora_21,
+  :fedora_22,
+  :ubuntu_1404,
+  :ubuntu_1504,
 ]