Merge pull request #52 from murdok5/win2016testing

Windows 2016 testing and cleanup
puppetlabs-seteam · Oct 23, 2017 · c2c6466 · c2c6466
2 parents 137eb83 + 98dd983
commit c2c6466
Show file tree

Hide file tree

Showing 15 changed files with 601 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,6 @@ hieradata/nodes/example-puppet-master.yaml
 .DS_Store
 /.bundle
 /.vagrant
-Gemfile.lock
 .*.sw?
 pkg
 fixtures

diff --git a/Gemfile b/Gemfile
@@ -17,14 +17,14 @@ gem 'r10k', '>= 2.5.5'
 
 group :development, :unit_tests do
   gem 'metadata-json-lint'
-  gem 'puppet_facts'
+  gem 'rspec-puppet-facts', :git => 'https://github.com/mcanevet/rspec-puppet-facts.git',
+                      :ref => 'fe21de12108fbab0123bdc4db2365a29ea62f171'
   gem 'puppet-blacksmith', '>= 3.4.0'
   gem 'simplecov'
   gem 'simplecov-console'
   gem 'rspec-puppet', :git => 'https://github.com/rodjek/rspec-puppet.git',
                       :ref => 'eaba657a8e876c8c4a881a6d47df76cfdda62b3f'
   gem 'puppet-syntax', '>= 2.4.0'
-  gem 'rspec-puppet-facts'
   gem 'parallel_tests'
   gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0'
 end