Merge branch 'ci-update' into 'master'

Update the CI tests

See merge request shared-puppet-modules-group/tor!18

1 files changed, 8 insertions, 17 deletions

diff --git a/Rakefile b/Rakefile
index 85326bb..401002e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,19 +1,10 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
+task :tests do
+  require 'puppetlabs_spec_helper/rake_tasks'
 
-desc "Validate manifests, templates, and ruby files"
-task :validate do
-  Dir['manifests/**/*.pp'].each do |manifest|
-    sh "puppet parser validate --noop #{manifest}"
-  end
-  Dir['spec/**/*.rb','lib/**/*.rb'].each do |ruby_file|
-    sh "ruby -c #{ruby_file}" unless ruby_file =~ /spec\/fixtures/
-  end
-  Dir['templates/**/*.erb'].each do |template|
-    sh "erb -P -x -T '-' #{template} | ruby -c"
-  end
-end
+  # run syntax checks on manifests, templates and hiera data
+  # also runs :metadata_lint
+  Rake::Task[:validate].invoke
 
-task :test => [:lint, :syntax , :validate, :spec]
+  # runs puppet-lint
+  Rake::Task[:lint].invoke
+end