Revert "Only test Boron in Rakefile suites on ..."

This reverts commit 8e3cd6ee9a0c484e9eb28f26f40fe8b909e8b974.

Change-Id: Ia93f05cbe1209d710266514524559b33b4332d4c
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/Rakefile b/Rakefile
index dbe33c0b51f735be7859c4e8b294978d107487bb..c845b6e09073b00d06fde98162760753643ef879 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -53,6 +53,11 @@ 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"
@@ -65,6 +70,11 @@ task :cent_5test_dock do
   sh "RS_SET=centos-7-docker 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 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 RPM_REPO='opendaylight-5-release' bundle exec rake beaker"
@@ -99,21 +109,34 @@ task :test => [
 desc "Quick and important tests"
 task :sanity=> [
   :test,
-  :cent_5test_dock,
+  :cent_6test_dock,
 ]
 
 desc "All tests, use VMs for Beaker tests"
-task :acceptance_vm => [
+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 :acceptance_dock => [
+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,
+  :cent_6test_dock,
+]