Use new default REST port 8181 vs old 8080+8181

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

diff --git a/Rakefile b/Rakefile
index 2797e9136d40a69a962aba3c14b01bcf22504740..97f8a624b806bbae362be7277aff9eb9c77eeac6 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,42 +16,76 @@ 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 Nexus VM
+desc "Beaker tests against CentOS 7 VM with latest Oxygen testing RPM from ODL Nexus repo"
+task :cent_8test_nexus_vm do
+  sh "RS_SET=centos-7 RPM_REPO='https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-$basearch-devel' bundle exec rake beaker"
+end
+
+# CentOS Nexus Container
+desc "Beaker tests against CentOS 7 container with latest Oxygen testing RPM from ODL Nexus repo"
+task :cent_8test_nexus_dock do
+  sh "RS_SET=centos-7-docker RPM_REPO='https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-$basearch-devel' bundle exec rake beaker"
+end
 
-desc "Run Beaker tests against CentOS 7 node."
-task :centos do
-  sh "RS_SET=centos-7 INSTALL_METHOD=rpm bundle exec rake beaker"
+# CentOS CBS VM
+desc "Beaker tests against CentOS 7 VM with latest Oxygen testing RPM from CentOS CBS repo"
+task :cent_8test_cbs_vm do
+  sh "RS_SET=centos-7 RPM_REPO='http://cbs.centos.org/repos/nfv7-opendaylight-8-testing/$basearch/os/' 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 CBS Container
+desc "Beaker tests against CentOS 7 container with latest Oxygen testing RPM from CentOS CBS repo"
+task :cent_8test_cbs_dock do
+  sh "RS_SET=centos-7-docker RPM_REPO='http://cbs.centos.org/repos/nfv7-opendaylight-8-testing/$basearch/os/' 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"
+# Ubuntu VMs
+desc "Beaker tests against Ubuntu 16.04 Container with Nitrogen release Deb"
+task :ubuntu_6test_vm do
+  sh "RS_SET=ubuntu-16 DEB_REPO='ppa:odl-team/nitrogen' bundle exec rake beaker"
 end
 
-desc "Run Beaker tests against Fedora 21 node."
-task :fedora_21 do
-  sh "RS_SET=fedora-21 bundle exec rake beaker"
+# Ubuntu Containers
+desc "Beaker tests against Ubuntu 16.04 Container with Nitrogen release Deb"
+task :ubuntu_6test_dock do
+  sh "RS_SET=ubuntu-16-docker DEB_REPO='ppa:odl-team/nitrogen' bundle exec rake beaker"
 end
 
-desc "All tests, including Beaker tests against all nodes."
-task :acceptance => [
+# Multi-test helpers
+
+desc "Run syntax, lint, and spec tests."
+task :test => [
+  :syntax,
+  :lint,
+  :metadata_lint,
+  :spec,
+]
+
+desc "Quick and important tests"
+task :sanity=> [
+  :test,
+  :cent_8test_nexus_dock,
+]
+
+desc "All tests, use VMs for Beaker tests"
+task :acceptance_vm => [
+  :test,
+  :ubuntu_6test_vm,
+  :cent_8test_cbs_vm,
+  :cent_8test_nexus_vm,
+]
+
+desc "All tests, use containers for Beaker tests"
+task :acceptance_dock => [
   :test,
-  :centos,
-  :fedora_20,
-  :fedora_21,
+  :ubuntu_6test_dock,
+  :cent_8test_cbs_dock,
+  :cent_8test_nexus_dock,
 ]