X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=Rakefile;h=2de9aa39959725e3f40b3bb7b723b99c7d98ceb2;hb=4fa363098e550d4d57245d0347763765a8291088;hp=f8b14c1440b9b92fc0e30024677756d94809a716;hpb=cea9c1d83cb2fce50ef598abfade67069e024051;p=integration%2Fpackaging%2Fpuppet-opendaylight.git

diff --git a/Rakefile b/Rakefile
index f8b14c1..2de9aa3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,31 +1,12 @@
-# Temporary fix for error caused by third party gems. See:
-# https://github.com/maestrodev/puppet-blacksmith/issues/14
-# https://github.com/dfarrell07/puppet-opendaylight/issues/6
-require 'puppet/version'
-require 'puppet/vendor/semantic/lib/semantic' unless Puppet.version.to_f <3.6
-
 require 'puppetlabs_spec_helper/rake_tasks'
 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 local_only`
-begin
-  require 'puppet_blacksmith/rake_tasks'
-rescue LoadError
-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.
-# http://puppet-lint.com/checks/class_parameter_defaults/
-PuppetLint.configuration.send('disable_class_parameter_defaults')
-# http://puppet-lint.com/checks/class_inherits_from_params_class/
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-
 exclude_paths = [
   "bundle/**/*",
   "pkg/**/*",
@@ -35,76 +16,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
 
-desc "Run syntax, lint, and spec tests."
-task :test => [
-  :syntax,
-  :lint,
-  :spec,
-  :metadata,
-]
+# CentOS VMs
 
-desc "Run Beaker tests against CentOS 7 with latest Beryllium RPM"
-task :centos_odl4testing do
-  sh "RS_SET=centos-7 INSTALL_METHOD=rpm RPM_REPO='opendaylight-4-testing' bundle exec rake beaker"
+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-7-testing' bundle exec rake beaker"
 end
 
-desc "Run Beaker tests against CentOS 7 with Beryllium SR2 4.2."
-task :centos_odl42 do
-  sh "RS_SET=centos-7 INSTALL_METHOD=rpm RPM_REPO='opendaylight-42-release' bundle exec rake beaker"
-end
+# CentOS Containers
 
-desc "Run Beaker tests against CentOS 7 with Beryllium 4.0."
-task :centos_odl40 do
-  sh "RS_SET=centos-7 INSTALL_METHOD=rpm RPM_REPO='opendaylight-40-release' bundle exec rake beaker"
+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-7-testing' 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
+# Ubuntu VMs
 
-# NB: The centos:7.0.1406 and centos:7.1.1503 tags have fakesytemd, not
-# the actually-functional systemd-container installed on centos:7
-# https://github.com/CentOS/sig-cloud-instance-build/commit/3bf1e7bbf14deaa8c047c1dfbead6d0e8d0665f2
-desc "Run Beaker tests against CentOS 7 Docker node."
-task :centos_docker do
-  sh "RS_SET=centos-7-docker INSTALL_METHOD=rpm bundle exec rake beaker"
+desc "Beaker tests against Ubuntu 16.04 Container with Boron release Deb"
+task :ubuntu_6test_vm do
+  sh "RS_SET=ubuntu-16 DEB_REPO='ppa:odl-team/carbon' 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
+# Ubuntu Containers
 
-desc "Run Beaker tests against Fedora 23 node."
-task :fedora_23 do
-  sh "RS_SET=fedora-23 INSTALL_METHOD=rpm bundle exec rake beaker"
+desc "Beaker tests against Ubuntu 16.04 Container with Boron release Deb"
+task :ubuntu_6test_dock do
+  sh "RS_SET=ubuntu-16-docker DEB_REPO='ppa:odl-team/carbon' bundle exec rake beaker"
 end
 
-desc "Run Beaker tests against Fedora 23 Docker node."
-task :fedora_23_docker do
-  sh "RS_SET=fedora-23-docker INSTALL_METHOD=rpm bundle exec rake beaker"
-end
+# Multi-test helpers
 
-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 syntax, lint, and spec tests."
+task :test => [
+  :syntax,
+  :lint,
+  :metadata_lint,
+  :spec,
+]
 
-desc "Run Beaker tests against Ubuntu 14.04 Docker node."
-task :ubuntu_1404_docker do
-  sh "RS_SET=ubuntu-1404-docker INSTALL_METHOD=tarball bundle exec rake beaker"
-end
+desc "Quick and important tests"
+task :sanity=> [
+  :test,
+  :cent_6test_dock,
+]
 
-# Note: Puppet currently doesn't support Ubuntu versions newer than 14.04
-# https://docs.puppetlabs.com/guides/install_puppet/install_debian_ubuntu.html
+desc "All tests, use VMs for Beaker tests"
+task :acceptance_vm => [
+  :test,
+  :ubuntu_6test_vm,
+  :cent_6test_vm,
+]
 
-desc "All tests, including Beaker tests against all nodes."
-task :acceptance => [
+desc "All tests, use containers for Beaker tests"
+task :acceptance_dock => [
   :test,
-  :centos_7_docker,
+  :ubuntu_6test_dock,
+  :cent_6test_dock,
 ]