Split tests into groups based on ODL major version

Per Tim, we need to move to branched model for puppet-opendaylight. Need
to support Boron in a stable/boron branch but allow it to break on
master or stable/carbon. New username/password change for example works
in Carbon but will never work in Boron becuase the required JAR will not
be backported.

Once we have split branches, we can refactor the test code to use the
right default ODL version per-branch. For now, just modify the tests we
call from master to only include Carbon tests.

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

diff --git a/Rakefile b/Rakefile
index ccdd960f79a290abcc5e314e11ca2d5b68247cc7..c845b6e09073b00d06fde98162760753643ef879 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -113,19 +113,30 @@ task :sanity=> [
 ]
 
 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,
 ]