Revert "Adds ability to configure ODL user/pass"

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

diff --git a/Rakefile b/Rakefile
index 470c931e6e53bd8adb3aa7bb1952f297d43d9d56..c845b6e09073b00d06fde98162760753643ef879 100644 (file)
--- 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,49 +35,108 @@ 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,
-]
+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 Boron testing RPM"
+task :cent_5test_vm do
+  sh "RS_SET=centos-7 RPM_REPO='opendaylight-5-testing' bundle exec rake beaker"
+end
+
+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
+
+desc "Beaker tests against CentOS 7 VM with latest Boron release RPM"
+task :cent_5rel_vm do
+  sh "RS_SET=centos-7 RPM_REPO='opendaylight-5-release' 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 Containers
+
+desc "Beaker tests against CentOS 7 container with latest Boron testing RPM"
+task :cent_5test_dock do
+  sh "RS_SET=centos-7-docker RPM_REPO='opendaylight-5-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"
+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
 
-desc "Run Beaker tests against Fedora 20 node."
-task :fedora_20 do
-  sh "RS_SET=fedora-20 INSTALL_METHOD=rpm bundle exec rake beaker"
+desc "Beaker tests against CentOS 7 container with latest Boron release RPM"
+task :cent_5rel_dock do
+  sh "RS_SET=centos-7-docker RPM_REPO='opendaylight-5-release' 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"
+# Ubuntu VMs
+
+desc "Beaker tests against Ubuntu 16.04 VM with Boron release Deb"
+task :ubuntu_5rel_vm do
+  sh "RS_SET=ubuntu-16 DEB_REPO='ppa:odl-team/boron' bundle exec rake beaker"
 end
 
-desc "Run Beaker tests against Ubuntu 14.04 node."
-task :ubuntu do
-  sh "RS_SET=ubuntu-1404 INSTALL_METHOD=tarball bundle exec rake beaker"
+# Ubuntu Containers
+
+desc "Beaker tests against Ubuntu 16.04 Container with Boron release Deb"
+task :ubuntu_5rel_dock do
+  sh "RS_SET=ubuntu-16-docker DEB_REPO='ppa:odl-team/boron' 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,
+  :travis_lint,
+  :spec,
+]
+
+desc "Quick and important tests"
+task :sanity=> [
+  :test,
+  :cent_6test_dock,
+]
+
+desc "All tests, use VMs for Beaker tests"
+task :acceptance5_vm => [
+  :test,
+  :cent_5rel_vm,
+  :ubuntu_5rel_vm,
+  :cent_5test_vm,
+]
+
+desc "All tests, use VMs for Beaker tests"
+task :acceptance6_vm => [
+  :test,
+  :cent_6test_vm,
+]
+
+desc "All tests, use containers for Beaker tests"
+task :acceptance5_dock => [
+  :test,
+  :cent_5rel_dock,
+  :ubuntu_5rel_dock,
+  :cent_5test_dock,
+]
+
+# TODO: Update .deb to Carbon and add a ubuntu_6test_dock test
+desc "All tests, use containers for Beaker tests"
+task :acceptance6_dock => [
   :test,
-  :centos,
-  :centos_tarball,
-  :fedora_20,
-  :fedora_21,
-  :ubuntu,
+  :cent_6test_dock,
 ]