simp-rspec-puppet-facts 3.2.0 → 3.5.1

data/spec/acceptance/nodesets/almalinux8.yml

@@ -0,0 +1,23 @@
+<%
+  if ENV['BEAKER_HYPERVISOR']
+    hypervisor = ENV['BEAKER_HYPERVISOR']
+  else
+    hypervisor = 'vagrant'
+  end
+-%>
+HOSTS:
+  el8.beaker.test:
+    roles:
+      - linux
+      - default
+    platform:   el-8-x86_64
+    box:        almalinux/8
+    hypervisor: <%= hypervisor %>
+
+CONFIG:
+  validate: false
+  log_level: verbose
+  type: aio
+<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
+  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
+<% end -%>

data/spec/acceptance/nodesets/almalinux9.yml

@@ -0,0 +1,23 @@
+<%
+  if ENV['BEAKER_HYPERVISOR']
+    hypervisor = ENV['BEAKER_HYPERVISOR']
+  else
+    hypervisor = 'vagrant'
+  end
+-%>
+HOSTS:
+  el9.beaker.test:
+    roles:
+      - linux
+      - default
+    platform:   el-9-x86_64
+    box:        almalinux/9
+    hypervisor: <%= hypervisor %>
+
+CONFIG:
+  validate: false
+  log_level: verbose
+  type: aio
+<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
+  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
+<% end -%>

data/spec/acceptance/nodesets/amzn2.yml

@@ -0,0 +1,23 @@
+<%
+  if ENV['BEAKER_HYPERVISOR']
+    hypervisor = ENV['BEAKER_HYPERVISOR']
+  else
+    hypervisor = 'vagrant'
+  end
+-%>
+HOSTS:
+  amzn2:
+    roles:
+      - default
+    platform: el-7-x86_64
+    box: gbailey/amzn2
+    hypervisor: <%= hypervisor %>
+
+CONFIG:
+  log_level: verbose
+  synced_folder : disabled
+  type: aio
+  vagrant_memsize: 512
+<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
+  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
+<% end -%>

data/spec/acceptance/nodesets/centos8.yml

@@ -11,7 +11,7 @@ HOSTS:
       - linux
       - default
     platform:   el-8-x86_64
-    box:        generic/centos8
+    box:        centos/stream8
     hypervisor: <%= hypervisor %>
 
 CONFIG:

data/spec/acceptance/nodesets/centos9.yml

@@ -0,0 +1,23 @@
+<%
+  if ENV['BEAKER_HYPERVISOR']
+    hypervisor = ENV['BEAKER_HYPERVISOR']
+  else
+    hypervisor = 'vagrant'
+  end
+-%>
+HOSTS:
+  el9.beaker.test:
+    roles:
+      - linux
+      - default
+    platform:   el-9-x86_64
+    box:        generic/centos9s
+    hypervisor: <%= hypervisor %>
+
+CONFIG:
+  validate: false
+  log_level: verbose
+  type: aio
+<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
+  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
+<% end -%>

data/spec/acceptance/nodesets/rhel8.yml

@@ -8,13 +8,14 @@
 HOSTS:
   rhel8:
     roles:
-      - default
       - linux
+      - default
     platform:   el-8-x86_64
     box:        generic/rhel8
     hypervisor: <%= hypervisor %>
 
 CONFIG:
+  validate: false
   log_level: verbose
   type: aio
 <% if ENV['BEAKER_PUPPET_COLLECTION'] -%>

data/spec/acceptance/nodesets/rhel9.yml

@@ -0,0 +1,23 @@
+<%
+  if ENV['BEAKER_HYPERVISOR']
+    hypervisor = ENV['BEAKER_HYPERVISOR']
+  else
+    hypervisor = 'vagrant'
+  end
+-%>
+HOSTS:
+  rhel9:
+    roles:
+      - linux
+      - default
+    platform:   el-9-x86_64
+    box:        generic/rhel9
+    hypervisor: <%= hypervisor %>
+
+CONFIG:
+  validate: false
+  log_level: verbose
+  type: aio
+<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
+  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
+<% end -%>

data/spec/acceptance/nodesets/rocky8.yml

@@ -11,7 +11,7 @@ HOSTS:
       - linux
       - default
     platform:   el-8-x86_64
-    box:        CrunchyData/rocky8
+    box:        rockylinux/8
     hypervisor: <%= hypervisor %>
     # NFS installation is broken
     synced_folder: disabled

data/spec/acceptance/nodesets/win_2012r2.yml

@@ -10,7 +10,7 @@ HOSTS:
     roles:
       - windows
     platform: windows-server-amd64
-    box: opentable/win-2012r2-standard-amd64-nocm
+    box: ferventcoder/win2012r2-x64-nocm
     hypervisor: <%= hypervisor %>
     vagrant_memsize: 2048
     vagrant_cpus: 2
@@ -21,7 +21,17 @@ HOSTS:
 CONFIG:
   log_level: verbose
   type: aio
-  vagrant_memsize: 256
 <% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
   puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
 <% end -%>
+  ssh:
+    keepalive: true
+    keepalive_interval: 10
+    host_key:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n#{' '*6}- ") %>
+    kex:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n#{' '*6}- ") %>
+    encryption:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
+    hmac:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>

data/spec/acceptance/nodesets/win_2016.yml

@@ -11,7 +11,7 @@ HOSTS:
       - windows
     platform: windows-server-amd64
     box: gusztavvargadr/windows-server
-    box_version: 1607.0.1909
+    box_version: 1607.0.2201
     hypervisor: <%= hypervisor %>
     vagrant_memsize: 2048
     vagrant_cpus: 2
@@ -22,7 +22,17 @@ HOSTS:
 CONFIG:
   log_level: verbose
   type: aio
-  vagrant_memsize: 256
 <% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
   puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
 <% end -%>
+  ssh:
+    keepalive: true
+    keepalive_interval: 10
+    host_key:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n#{' '*6}- ") %>
+    kex:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n#{' '*6}- ") %>
+    encryption:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
+    hmac:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>

data/spec/acceptance/nodesets/win_2019.yml

@@ -11,6 +11,7 @@ HOSTS:
       - windows
     platform: windows-server-amd64
     box: gusztavvargadr/windows-server
+    box_version: 1809.0.2205
     hypervisor: <%= hypervisor %>
     vagrant_memsize: 2048
     vagrant_cpus: 2
@@ -21,7 +22,17 @@ HOSTS:
 CONFIG:
   log_level: verbose
   type: aio
-  vagrant_memsize: 256
 <% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
   puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
 <% end -%>
+  ssh:
+    keepalive: true
+    keepalive_interval: 10
+    host_key:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n#{' '*6}- ") %>
+    kex:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n#{' '*6}- ") %>
+    encryption:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
+    hmac:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>

data/spec/acceptance/nodesets/win_2022.yml

@@ -0,0 +1,38 @@
+<%
+  if ENV['BEAKER_HYPERVISOR']
+    hypervisor = ENV['BEAKER_HYPERVISOR']
+  else
+    hypervisor = 'vagrant'
+  end
+-%>
+HOSTS:
+  win:
+    roles:
+      - windows
+    platform: windows-server-amd64
+    box: gusztavvargadr/windows-server
+    box_version: 2102.0.2205
+    hypervisor: <%= hypervisor %>
+    vagrant_memsize: 2048
+    vagrant_cpus: 2
+    user: vagrant
+    communicator: winrm
+    is_cygwin: false
+
+CONFIG:
+  log_level: verbose
+  type: aio
+<% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
+  puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
+<% end -%>
+  ssh:
+    keepalive: true
+    keepalive_interval: 10
+    host_key:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n#{' '*6}- ") %>
+    kex:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n#{' '*6}- ") %>
+    encryption:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
+    hmac:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>

data/spec/acceptance/suites/default/00_default_spec.rb

@@ -37,10 +37,14 @@ describe 'look out muppets' do
       end
 
       it 'should collect valid fact data' do
-        # Stupid RSpec tricks
-        output = on(host, 'puppet facts --render-as json').stdout
+        output = on(host, 'puppet facts --render-as json').stdout.lines.last
 
-        expect{@output << JSON.parse(output)['values']}.to_not raise_error
+        expect do
+          parsed_output = JSON.parse(output)
+
+          # Something changed in the puppet facts output so handle both cases
+          @output.push(parsed_output['values'] || parsed_output)
+        end.to_not raise_error
       end
 
       # This should work regardless of OS

data/spec/acceptance/suites/default/nodesets

@@ -1 +1 @@
-spec/acceptance/suites/default/../../nodesets
+../../nodesets

data/spec/fixtures/metadata.json

@@ -15,27 +15,31 @@
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "6",
-        "7"
+        "7",
+        "8"
       ]
     }
   ],
   "puppet_version": [
-    "2.7",
-    "3.0",
-    "3.1",
-    "3.2",
-    "3.3",
-    "3.4",
-    "3.5",
-    "3.6",
-    "3.7"
+    "5.5",
+    "6.0",
+    "6.4",
+    "6.5",
+    "6.6",
+    "6.16",
+    "6.18",
+    "6.22",
+    "7.0",
+    "7.0",
+    "7.4",
+    "7.5",
+    "7.6"
   ]
 }

data/spec/simp_rspec_puppet_facts_spec.rb

@@ -24,22 +24,22 @@ describe 'Simp::RspecPuppetFacts' do
           expect(subject.size).to be >= 4
         end
         it 'should return supported OS' do
-          expect(subject.keys.sort).to include 'centos-6-x86_64'
           expect(subject.keys.sort).to include 'centos-7-x86_64'
-          expect(subject.keys.sort).to include 'redhat-6-x86_64'
+          expect(subject.keys.sort).to include 'centos-8-x86_64'
           expect(subject.keys.sort).to include 'redhat-7-x86_64'
+          expect(subject.keys.sort).to include 'redhat-8-x86_64'
         end
         it 'should return SIMP-specific OS facts' do
           grub_version_facts = subject.map{ |os,data|  {os =>
             data.select{ |x,v| x == :uid_min || x == :grub_version }}}
           expect( grub_version_facts ).to include(
-            {"centos-6-x86_64"=>{:uid_min=>"500",  :grub_version=>"0.97"}}
+            {"centos-8-x86_64"=>{:uid_min=>"1000",  :grub_version=>"2.03"}}
           )
           expect( grub_version_facts ).to include(
             {"centos-7-x86_64"=>{:uid_min=>"1000", :grub_version=>"2.02~beta2"}}
           )
           expect( grub_version_facts ).to include(
-            {"redhat-6-x86_64"=>{:uid_min=>"500",  :grub_version=>"0.97"}}
+            {"redhat-8-x86_64"=>{:uid_min=>"1000",  :grub_version=>"2.03"}}
           )
           expect( grub_version_facts ).to include(
             {"redhat-7-x86_64"=>{:uid_min=>"1000", :grub_version=>"2.02~beta2"}}
@@ -81,7 +81,7 @@ describe 'Simp::RspecPuppetFacts' do
     context 'When specifying SIMP_FACTS_OS=redhat-6-x86_64,redhat-7-x86_64' do
       subject {
         x = ENV['SIMP_FACTS_OS']
-        ENV['SIMP_FACTS_OS']='redhat-6-x86_64,redhat-7-x86_64'
+        ENV['SIMP_FACTS_OS']='centos,redhat-7-x86_64'
         h = on_supported_os()
         ENV['SIMP_FACTS_OS']=x
         h
@@ -89,12 +89,13 @@ describe 'Simp::RspecPuppetFacts' do
       it 'should return a hash' do
         expect(subject.class).to eq Hash
       end
-      it 'should have 2 elements' do
-        expect(subject.size).to eq 2
+      it 'should have 3 elements' do
+        expect(subject.size).to eq 3
       end
       it 'should return supported OS' do
         expect(subject.keys.sort).to eq [
-          'redhat-6-x86_64',
+          'centos-7-x86_64',
+          'centos-8-x86_64',
           'redhat-7-x86_64',
         ]
       end
@@ -117,8 +118,9 @@ describe 'Simp::RspecPuppetFacts' do
         )
       }
 
-      it 'should output warning message' do
-        expect { subject }.to output(/Can't find facts for 'debian-X-x86_64'/).to_stderr
+
+       it 'should output warning message', skip: "rspec issue: No longer able to catch message on stdout or stderr" do
+        expect { subject }.to output(%r(No facts were found in the FacterDB)).to_stdout
       end
     end
   end

data/spec/spec_helper_acceptance.rb

@@ -4,7 +4,6 @@ require 'yaml'
 require 'simp/beaker_helpers'
 include Simp::BeakerHelpers
 
-require 'beaker/puppet_install_helper'
 require 'beaker-windows'
 include BeakerWindows::Path
 include BeakerWindows::Powershell
@@ -12,14 +11,46 @@ include BeakerWindows::Registry
 include BeakerWindows::WindowsFeature
 
 unless ENV['BEAKER_provision'] == 'no'
+  to_skip = []
+
+  facter_ng = ( ENV['BEAKER_facter_ng'] == 'yes' ? true : false )
+
   hosts.each do |host|
     # Install Puppet
     if host.is_pe?
       install_pe
+    elsif ENV['FACTER_GEM_VERSION']
+      begin
+        install_puppet_from_gem_on(
+          host,
+          version: ENV['PUPPET_VERSION'],
+          facter_version: ENV['FACTER_GEM_VERSION']
+        )
+
+        # Make scaffold dirs?
+        code_dir = on(host, 'puppet config print codedir').stdout.strip
+
+        host.mkdir_p("#{code_dir}/modules")
+      rescue => e
+        puts "#{host} does not support installing puppet from Gem...skipping"
+        puts e
+
+        to_skip << host
+
+        next
+      end
     else
       install_puppet
+
+      if facter_ng
+        on(host, 'puppet config set facterng true')
+      end
     end
   end
+
+  to_skip.each do |host|
+    hosts.delete(host)
+  end
 end
 
 hosts.each do |host|