Only do Carbon tests on master/carbon branches

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

diff --git a/Rakefile b/Rakefile
index ea70bbc342107aa862c3fb6962143351f809191d..42daeea9bbd29240804fb19a8f3979c878ce379d 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -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,61 +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
 
-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"
+task :travis_lint do
+  # Using "echo y" to accept interactive "install shell completion?" prompt
+  sh 'echo "y" | travis lint .travis.yml --debug'
 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
+# CentOS 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_7_docker do
-  sh "RS_SET=centos-7-docker INSTALL_METHOD=rpm 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-6-testing' 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
+# CentOS Containers
 
-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"
+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 Ubuntu 14.04 node."
-task :ubuntu_1404 do
-  sh "RS_SET=ubuntu-1404 INSTALL_METHOD=tarball bundle exec rake beaker"
-end
+# Ubuntu VMs
 
-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
+# TODO: Add ubuntu_6test_dock task
+
+# Ubuntu Containers
+
+# TODO: Add ubuntu_6test_dock task
 
-# Note: Puppet currently doesn't support Ubuntu versions newer than 14.04
-# https://docs.puppetlabs.com/guides/install_puppet/install_debian_ubuntu.html
+# 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,
+]
+
+# 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_7_docker,
+  :cent_6test_dock,
 ]