From 4274de5766364b6e532a3934073c34c7af4272e9 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Fri, 7 Oct 2016 10:34:02 +0200 Subject: [PATCH] Fix tests in the CI puppet-lint installed from the master branch breaks the CI. This change uses the official gem instead because the latest version now includes the bug fix that wasn't released before. Change-Id: I646176e30494cf1e8fac97c6ecebb3899ade8107 (cherry picked from commit 93129efdd0daeee4b1679fbdda4e3c3f513912f8) --- deployment_scripts/puppet/manifests/Gemfile | 3 --- deployment_scripts/puppet/modules/fuel_lma_collector/Gemfile | 3 --- deployment_scripts/puppet/modules/lma_collector/Gemfile | 3 --- 3 files changed, 9 deletions(-) diff --git a/deployment_scripts/puppet/manifests/Gemfile b/deployment_scripts/puppet/manifests/Gemfile index e7b0bc877..e4105df7f 100644 --- a/deployment_scripts/puppet/manifests/Gemfile +++ b/deployment_scripts/puppet/manifests/Gemfile @@ -18,7 +18,4 @@ group :development, :test do gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.4.0' # Newer puppetlabs_spec_helper depends on rubocop-rspec that requires ruby >= 2.2.0 gem 'puppetlabs_spec_helper', '~> 1.1.1' - # Need to use master branch of puppet-lint because of - # https://github.com/rodjek/puppet-lint/issues/472 - gem 'puppet-lint', :git => 'https://github.com/rodjek/puppet-lint.git' end diff --git a/deployment_scripts/puppet/modules/fuel_lma_collector/Gemfile b/deployment_scripts/puppet/modules/fuel_lma_collector/Gemfile index 6ca13436d..585f6b784 100644 --- a/deployment_scripts/puppet/modules/fuel_lma_collector/Gemfile +++ b/deployment_scripts/puppet/modules/fuel_lma_collector/Gemfile @@ -22,7 +22,4 @@ group :development, :test do # Newer puppetlabs_spec_helper depends on rubocop-rspec that requires ruby >= 2.2.0 gem 'puppetlabs_spec_helper', '~> 1.1.1' gem 'metadata-json-lint' - # Need to use master branch of puppet-lint because of - # https://github.com/rodjek/puppet-lint/issues/472 - gem 'puppet-lint', :git => 'https://github.com/rodjek/puppet-lint.git' end diff --git a/deployment_scripts/puppet/modules/lma_collector/Gemfile b/deployment_scripts/puppet/modules/lma_collector/Gemfile index 6ca13436d..585f6b784 100644 --- a/deployment_scripts/puppet/modules/lma_collector/Gemfile +++ b/deployment_scripts/puppet/modules/lma_collector/Gemfile @@ -22,7 +22,4 @@ group :development, :test do # Newer puppetlabs_spec_helper depends on rubocop-rspec that requires ruby >= 2.2.0 gem 'puppetlabs_spec_helper', '~> 1.1.1' gem 'metadata-json-lint' - # Need to use master branch of puppet-lint because of - # https://github.com/rodjek/puppet-lint/issues/472 - gem 'puppet-lint', :git => 'https://github.com/rodjek/puppet-lint.git' end