X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=Rakefile;h=bf0758f471ab6845eb719efacdf72c708cc538c4;hb=refs%2Fchanges%2F92%2F55592%2F1;hp=fa9455c8aeeed944945aa27199957386594389b1;hpb=c194a981b2c4e392bd027af26e09f32f27378497;p=integration%2Fpackaging%2Fpuppet-opendaylight.git

diff --git a/Rakefile b/Rakefile
index fa9455c..bf0758f 100644
--- 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
@@ -57,14 +57,12 @@ task :centos_tarball do
   sh "RS_SET=centos-7 INSTALL_METHOD=tarball 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"
-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"
+# 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"
 end
 
 desc "Run Beaker tests against Fedora 22 node."
@@ -73,16 +71,21 @@ task :fedora_22 do
 end
 
 desc "Run Beaker tests against Ubuntu 14.04 node."
-task :ubuntu do
+task :ubuntu_1404 do
   sh "RS_SET=ubuntu-1404 INSTALL_METHOD=tarball bundle exec rake beaker"
 end
 
+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
+
+# Note: Puppet currently doesn't support Ubuntu versions newer than 14.04
+# https://docs.puppetlabs.com/guides/install_puppet/install_debian_ubuntu.html
+
 desc "All tests, including Beaker tests against all nodes."
 task :acceptance => [
   :test,
-  :centos,
-  :centos_tarball,
-  :fedora_20,
-  :fedora_21,
-  :ubuntu,
+  :centos_7_docker,
+  :ubuntu_1404_docker,
 ]