Merge pull request #589 from alexjfisher/facterversion

Use 3.9 as default facterlib facts version
voxpupuli · Sep 24, 2019 · 17f763d · 17f763d
2 parents f5a2e25 + d50f6b3
commit 17f763d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/config_defaults.yml b/config_defaults.yml
@@ -37,7 +37,7 @@ Gemfile:
       - gem: puppetlabs_spec_helper
         version: '>= 2.14.0'
       - gem: rspec-puppet-facts
-        version: '>= 1.8.0'
+        version: '>= 1.9.5'
       - gem: rspec-puppet-utils
       - gem: puppet-lint-leading_zero-check
       - gem: puppet-lint-trailing_comma-check
@@ -130,5 +130,6 @@ spec/acceptance/nodesets/ubuntu-server-1604-x64.yml:
   delete: true
 spec/spec_helper.rb:
   mock_with: ':rspec'
+  facterdb_facts_version: '3.9'
 ...
 # vim: syntax=yaml
diff --git a/moduleroot/spec/spec_helper.rb.erb b/moduleroot/spec/spec_helper.rb.erb
@@ -60,8 +60,9 @@ end
 RSpec.configure do |c|
   <%- if @configs['hiera_config'] -%>
   c.hiera_config = <%= @configs['hiera_config'] %>
-
   <%- end -%>
+  c.default_facter_version = ENV['FACTERDB_FACTS_VERSION'] || '<%= @configs['facterdb_facts_version'] %>'
+
   # Coverage generation
   c.after(:suite) do
     RSpec::Puppet::Coverage.report!