X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=Rakefile;h=42daeea9bbd29240804fb19a8f3979c878ce379d;hb=b1c21f3424b3e40fb3d5df8b3e4819fd8db80584;hp=37f32c9016d3e7ff541c826b7e2839c260d12a95;hpb=e57f0f59410f5fc386b5bf170f69ef1bc28a5df3;p=integration%2Fpackaging%2Fpuppet-opendaylight.git

diff --git a/Rakefile b/Rakefile
index 37f32c9..42daeea 100644
--- a/Rakefile
+++ b/Rakefile
@@ -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
@@ -17,7 +17,7 @@ end
 
 PuppetLint.configuration.relative = true
 PuppetLint.configuration.send("disable_80chars")
-PuppetLint.configuration.log_format = "%{path}:%{linenumber}:%{check}:%{KIND}:%{message}"
+PuppetLint.configuration.log_format = "%{path}:%{line}:%{check}:%{KIND}:%{message}"
 PuppetLint.configuration.fail_on_warnings = true
 
 # Forsake support for Puppet 2.6.2 for the benefit of cleaner code.
@@ -35,42 +35,66 @@ exclude_paths = [
 PuppetLint.configuration.ignore_paths = exclude_paths
 PuppetSyntax.exclude_paths = exclude_paths
 
-task :metadata do
+# Linting
+
+task :metadata_lint do
   sh "metadata-json-lint metadata.json"
 end
 
+task :travis_lint do
+  # Using "echo y" to accept interactive "install shell completion?" prompt
+  sh 'echo "y" | travis lint .travis.yml --debug'
+end
+
+# CentOS VMs
+
+desc "Beaker tests against CentOS 7 VM with latest Carbon testing RPM"
+task :cent_6test_vm do
+  sh "RS_SET=centos-7 RPM_REPO='opendaylight-6-testing' bundle exec rake beaker"
+end
+
+# CentOS Containers
+
+desc "Beaker tests against CentOS 7 container with latest Carbon testing RPM"
+task :cent_6test_dock do
+  sh "RS_SET=centos-7-docker RPM_REPO='opendaylight-6-testing' bundle exec rake beaker"
+end
+
+# Ubuntu VMs
+
+# TODO: Add ubuntu_6test_dock task
+
+# Ubuntu Containers
+
+# TODO: Add ubuntu_6test_dock task
+
+# Multi-test helpers
+
 desc "Run syntax, lint, and spec tests."
 task :test => [
   :syntax,
   :lint,
+  :metadata_lint,
+  :travis_lint,
   :spec,
-  :metadata,
 ]
 
-desc "Run Beaker tests against CentOS 7 node."
-task :centos do
-  sh "RS_SET=centos-7 bundle exec rake beaker"
-end
-
-desc "Run Beaker tests against CentOS 7 using tarball install."
-task :centos_tarball do
-  sh "RS_SET=centos-7-tarball bundle exec rake beaker"
-end
-
-desc "Run Beaker tests against Fedora 20 node."
-task :fedora_20 do
-  sh "RS_SET=fedora-20 bundle exec rake beaker"
-end
+desc "Quick and important tests"
+task :sanity=> [
+  :test,
+  :cent_6test_dock,
+]
 
-desc "Run Beaker tests against Fedora 21 node."
-task :fedora_21 do
-  sh "RS_SET=fedora-21 bundle exec rake beaker"
-end
+# TODO: Update .deb to Carbon and add a ubuntu_6test_vm test
+desc "All tests, use VMs for Beaker tests"
+task :acceptance_vm => [
+  :test,
+  :cent_6test_vm,
+]
 
-desc "All tests, including Beaker tests against all nodes."
-task :acceptance => [
+# TODO: Update .deb to Carbon and add a ubuntu_6test_dock test
+desc "All tests, use containers for Beaker tests"
+task :acceptance_dock => [
   :test,
-  :centos,
-  :fedora_20,
-  :fedora_21,
+  :cent_6test_dock,
 ]