diff --git a/Gemfile b/Gemfile index 773ce4f..991761c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,13 +1,14 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' -puppetversion = ENV.key?('PUPPET_VERSION') ? ENV['PUPPET_VERSION'] : ['>= 3.3'] +puppetversion = ENV.key?('PUPPET_VERSION') ? ENV['PUPPET_VERSION'] : ['<= 5.5.6'] gem 'metadata-json-lint' gem 'puppet', puppetversion gem 'puppetlabs_spec_helper', '>= 1.0.0' -gem 'puppet-lint', '>= 1.0.0' -gem 'facter', '>= 1.7.0' +gem 'puppet-lint' +gem 'facter' gem 'rspec-puppet' -gem 'puppet-strings', '<= 1.2.1' +gem 'yard' + gem 'puppet-strings', '< 2.0.0' gem 'rake' gem 'semantic_puppet' gem 'rgen' diff --git a/Jenkinsfile b/Jenkinsfile index b47b2b1..b3e695b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,9 +28,9 @@ pipeline { --no-class_inherits_from_params_class-check \\ --no-variable_scope-check \\ --no-80chars-check \\ - --no-140chars-check \\ --no-arrow_alignment-check \\ --no-autoloader_layout-check \\ + --no-140chars-check \\ --log-format "%{path}:%{line}:%{check}:%{KIND}:%{message}" {} \\;''' } } @@ -38,7 +38,7 @@ pipeline { stage('puppet parser test') { steps { sh '''for file in $(find . -iname \'*.pp\'); do - puppet parser validate --color false --render-as s --modulepath=modules $file || exit 1; + /opt/puppetlabs/bin/puppet parser validate --color false --render-as s --modulepath=modules $file || exit 1; done;''' } } @@ -59,16 +59,14 @@ pipeline { stage('update repo structure') { steps { - sh '''if [ test -f REPOSTRUCTURE.md ]; then - rm -Rf REPOSTRUCTURE.md - fi + sh '''rm -Rf REPOSTRUCTURE.md echo "$(tree --dirsfirst --charset=ascii .)" > REPOSTRUCTURE.md''' } } stage('create Puppet documention') { steps { - sh 'puppet strings' + sh '/opt/puppetlabs/bin/puppet strings' } } @@ -165,7 +163,7 @@ Changelog of Git Changelog. {{#commits}} -{{hash}} {{authorName}} {{commitTime}} +{{hash}} {{authorName}} {{commitTime}}