2 files changed, 26 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index b3c4e1775..5ddad9788 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 0.24.x
+    Added Rake :ci namespace and CI tasks
+
     Fixed #1767 - Minor fix to emacs mode
 
     Fixed #1711 - fileserver test fails due to incorrect mocking
diff --git a/Rakefile b/Rakefile
index e30c70e1c..f6fee2cb8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -137,7 +137,7 @@ desc "Run the specs under spec/"
 task :spec do
     require 'spec'
     require 'spec/rake/spectask'
-    require 'rcov'
+    # require 'rcov'
     Spec::Rake::SpecTask.new do |t|
          #   t.rcov = true
          t.spec_opts = ['--format','s', '--loadby','mtime']
@@ -150,6 +150,29 @@ task :unit do
     sh "cd test; rake"
 end
 
+namespace :ci do
+
+  desc "Run the CI prep tasks"
+  task :prep do
+    require 'rubygems'
+    gem 'ci_reporter'
+    require 'ci/reporter/rake/rspec'
+    require 'ci/reporter/rake/test_unit'
+    ENV['CI_REPORTS'] = 'results'
+  end
+
+  desc "Run CI Unit tests"
+  task :unit => [:prep, 'ci:setup:testunit'] do
+     sh "cd test; rake test"
+  end
+
+  desc "Run CI RSpec tests"
+  task :spec => [:prep, 'ci:setup:rspec'] do
+     sh "cd spec; rake all"
+  end
+
+end
+
 desc "Send patch information to the puppet-dev list"
 task :mail_patches do
     if Dir.glob("00*.patch").length > 0