From 595ab2988648f0fe2e135c23dc2b65cedb45bedb Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Wed, 29 Dec 2021 15:22:34 +0100 Subject: [PATCH] TODO-00013 - remove gem references --- Gemfile | 27 --------------------------- Jenkinsfile | 10 ++-------- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 Gemfile diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 49f82d7..0000000 --- a/Gemfile +++ /dev/null @@ -1,27 +0,0 @@ -source ENV['GEM_SOURCE'] || 'https://rubygems.org' - -puppetversion = ENV.key?('PUPPET_VERSION') ? ENV['PUPPET_VERSION'] : ['<= 5.5.6'] -gem 'metadata-json-lint', '~> 2.4' -gem 'puppet', puppetversion -gem 'puppetlabs_spec_helper', '~> 3.0' -gem 'puppet-lint' -gem 'facter' -gem 'rspec-puppet' -gem 'yard' -gem 'puppet-strings', '< 2.0.0' -gem 'rake', '~> 12.3', '>= 12.3.3' -gem 'semantic_puppet' -gem 'rgen' -gem 'public_suffix', '<= 2.0.5' -gem 'parallel', '<= 1.13.0' -gem 'puppet-syntax', '~> 2.6', '>= 2.6.1' -gem 'pathspec', '~> 0.2.1' - -# rspec must be v2 for ruby 1.8.7 -if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9' - gem 'rspec', '~> 2.0' - gem 'rake', '~> 10.0' -else - # rubocop requires ruby >= 1.9 - gem 'rubocop', '<= 0.50.0' -end diff --git a/Jenkinsfile b/Jenkinsfile index 9abeb4f..b33ce9e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,7 +22,7 @@ pipeline { stages { - stage('pulling master') { + stage('pull master') { steps { sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { sh '''git config user.name "Jenkins Server" @@ -33,12 +33,6 @@ pipeline { } } - stage('install gems') { - steps { - sh 'bundle install' - } - } - stage('puppet parser') { steps { sh '''for file in $(find . -iname \'*.pp\'); do @@ -57,7 +51,7 @@ pipeline { stage('puppet-lint') { steps { - sh '''find . -iname *.pp -exec /var/lib/jenkins/bin/puppet-lint \\ + sh '''find . -iname *.pp -exec /usr/local/rvm/gems/ruby-2.5.0/wrappers/puppet-lint \\ --no-class_inherits_from_params_class-check \\ --no-variable_scope-check \\ --no-80chars-check \\