Only do Carbon tests on master/carbon branches

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

diff --git a/Rakefile b/Rakefile
index f08101be813fe04dfe52819f11f51b1b51dfc412..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.
@@ -46,41 +46,27 @@ task :travis_lint do
   sh 'echo "y" | travis lint .travis.yml --debug'
 end
 
-# TODO: Add Coala helper
-
 # CentOS VMs
 
-desc "Beaker tests against CentOS 7 VM with latest Boron testing RPM"
-task :cent_5test_vm do
-  sh "RS_SET=centos-7 INSTALL_METHOD=rpm 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 INSTALL_METHOD=rpm 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 INSTALL_METHOD=rpm RPM_REPO='opendaylight-5-release' bundle exec rake beaker"
+  sh "RS_SET=centos-7 RPM_REPO='opendaylight-6-testing' bundle exec rake beaker"
 end
 
 # 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 INSTALL_METHOD=rpm RPM_REPO='opendaylight-5-testing' bundle exec rake beaker"
-end
-
 desc "Beaker tests against CentOS 7 container with latest Carbon testing RPM"
 task :cent_6test_dock do
-  sh "RS_SET=centos-7-docker INSTALL_METHOD=rpm RPM_REPO='opendaylight-6-testing' bundle exec rake beaker"
+  sh "RS_SET=centos-7-docker RPM_REPO='opendaylight-6-testing' bundle exec rake beaker"
 end
 
-desc "Beaker tests against CentOS 7 container with latest Boron release RPM"
-task :cent_5rel_dock do
-  sh "RS_SET=centos-7-docker INSTALL_METHOD=rpm RPM_REPO='opendaylight-5-release' bundle exec rake beaker"
-end
+# Ubuntu VMs
+
+# TODO: Add ubuntu_6test_dock task
+
+# Ubuntu Containers
+
+# TODO: Add ubuntu_6test_dock task
 
 # Multi-test helpers
 
@@ -93,18 +79,22 @@ task :test => [
   :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_5rel_vm,
-  :cent_5test_vm,
   :cent_6test_vm,
 ]
 
+# TODO: Update .deb to Carbon and add a ubuntu_6test_dock test
 desc "All tests, use containers for Beaker tests"
 task :acceptance_dock => [
   :test,
-  :cent_5rel_dock,
-  :cent_5test_dock,
   :cent_6test_dock,
 ]