Upgrade Beaker 3 to 4

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

diff --git a/Rakefile b/Rakefile
index a6c3ecb2eed7b39989df1c24642ce7736bb61e7f..b424ff7a86de5d6fb2e04d799a2cb8f81e295916 100644 (file)
--- 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 development
-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,61 +16,64 @@ 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,
-]
-
-desc "Run Beaker tests against CentOS 7 node."
-task :centos do
-  sh "RS_SET=centos-7 INSTALL_METHOD=rpm bundle exec rake beaker"
+# CentOS latest VM
+desc "Beaker tests against CentOS 7 VM with latest Fluorine RPM from ODL Nexus CD repo"
+task :cent_devel_vm do
+  sh "RS_SET=centos-7 RPM_REPO='https://nexus.opendaylight.org/content/repositories/opendaylight-fluorine-epel-7-$basearch-devel' 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"
+# CentOS latest container
+desc "Beaker tests against CentOS 7 container with latest Fluorine RPM from ODL Nexus CD repo"
+task :cent_devel_dock do
+  sh "RS_SET=centos-7-docker RPM_REPO='https://nexus.opendaylight.org/content/repositories/opendaylight-fluorine-epel-7-$basearch-devel' 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
+# CentOS latest release/SR VM
+#desc "Beaker tests against CentOS 7 VM with latest Fluorine release/SR RPM from CentOS CBS repo"
+#task :cent_rel_vm do
+#  sh "RS_SET=centos-7 RPM_REPO='http://cbs.centos.org/repos/nfv7-opendaylight-9-release/$basearch/os/' 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
+# CentOS latest release/SR container
+# Uncomment once there's a Fluorine release
+#desc "Beaker tests against CentOS 7 container with latest Fluorine release/SR RPM from CentOS CBS repo"
+#task :cent_rel_dock do
+#  sh "RS_SET=centos-7-docker RPM_REPO='http://cbs.centos.org/repos/nfv7-opendaylight-9-release/$basearch/os/' 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
+# 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 15.04 node."
-task :ubuntu_1504 do
-  sh "RS_SET=ubuntu-1504 INSTALL_METHOD=tarball bundle exec rake beaker"
-end
+desc "Quick and important tests"
+task :sanity=> [
+  :test,
+  :cent_devel_dock,
+]
+
+desc "All tests, use VMs for Beaker tests"
+task :acceptance_vm => [
+  :test,
+  :cent_devel_vm,
+# Uncomment once there's a Fluorine release
+#  :cent_rel_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,
-  :centos_tarball,
-  :fedora_20,
-  :fedora_21,
-  :fedora_22,
-  :ubuntu_1404,
-  :ubuntu_1504,
+  :cent_devel_dock,
+# Uncomment once there's a Fluorine release
+#  :cent_rel_dock,
 ]