X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=Rakefile;h=2797e9136d40a69a962aba3c14b01bcf22504740;hb=refs%2Fchanges%2F58%2F55458%2F1;hp=cf76bedf6e2d107812eef3954668232dc3ccf9bd;hpb=1fb05ddbdcd6fbc6f44c6edb2d78de075f1bb4c6;p=integration%2Fpackaging%2Fpuppet-opendaylight.git

diff --git a/Rakefile b/Rakefile
index cf76bed..2797e91 100644
--- 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
 
@@ -35,11 +35,6 @@ exclude_paths = [
 PuppetLint.configuration.ignore_paths = exclude_paths
 PuppetSyntax.exclude_paths = exclude_paths
 
-desc "Run acceptance tests"
-RSpec::Core::RakeTask.new(:acceptance) do |t|
-  t.pattern = 'spec/acceptance'
-end
-
 task :metadata do
   sh "metadata-json-lint metadata.json"
 end
@@ -52,18 +47,30 @@ task :test => [
   :metadata,
 ]
 
-desc "Run Beaker tests CentOS 7 node."
-task :beaker_centos7 do
-  sh "RS_SET=centos-7 bundle exec rake beaker"
+desc "Run Beaker tests against CentOS 7 node."
+task :centos do
+  sh "RS_SET=centos-7 INSTALL_METHOD=rpm bundle exec rake beaker"
+end
+
+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 Fedora 20 node."
-task :beaker_fedora20 do
+desc "Run Beaker tests against Fedora 20 node."
+task :fedora_20 do
   sh "RS_SET=fedora-20 bundle exec rake beaker"
 end
 
-desc "Run Beaker tests against all nodes."
-task :beaker_all => [
-  :beaker_centos7,
-  :beaker_fedora20,
+desc "Run Beaker tests against Fedora 21 node."
+task :fedora_21 do
+  sh "RS_SET=fedora-21 bundle exec rake beaker"
+end
+
+desc "All tests, including Beaker tests against all nodes."
+task :acceptance => [
+  :test,
+  :centos,
+  :fedora_20,
+  :fedora_21,
 ]