From bb860a7eba01f5d8b0df530383beff1b8f529de6 Mon Sep 17 00:00:00 2001 From: Casey Williams Date: Tue, 4 Dec 2018 17:15:28 -0800 Subject: [PATCH 1/2] (maint) Update rspec-puppet to 2.7.2 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 3e14c6fc0..0a12750d4 100644 --- a/Gemfile +++ b/Gemfile @@ -49,7 +49,7 @@ group :development do gem "json_pure", '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0') gem "fast_gettext", '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0') gem "fast_gettext", :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0') - gem "rspec-puppet", "2.6.9", :require => false + gem "rspec-puppet", "2.7.2", :require => false end group :system_tests do From d1859e486c17460568ae5809180180740f96e00f Mon Sep 17 00:00:00 2001 From: Casey Williams Date: Tue, 4 Dec 2018 17:16:57 -0800 Subject: [PATCH 2/2] (maint) Add yumrepo_core fixture for spec tests yumrepo was removed from puppet 6 and is now bundled with AIO puppet-agents as the yumrepo_core module. The puppet 6 gem, however, cannot manage yumrepo resources out of the box; Adding yumrepo_core as a fixture allows spec tests to pass with the puppet gem at version 6+. --- .fixtures.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.fixtures.yml b/.fixtures.yml index 1b21f3bfb..694104e61 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -11,5 +11,7 @@ fixtures: apt: repo: "puppetlabs/apt" ref: "2.3.0" + yumrepo_core: + repo: "puppetlabs/yumrepo_core" symlinks: puppet_agent: "#{source_dir}"