simp-rspec-puppet-facts 2.4.0 → 2.4.1

data/lib/simp/version.rb

@@ -1,4 +1,4 @@
 module Simp; end
 module Simp::RspecPuppetFacts
-  VERSION = '2.4.0'
+  VERSION = '2.4.1'
 end

data/spec/acceptance/nodesets/{oel.yml → oel7.yml}

@@ -8,26 +8,12 @@
 HOSTS:
   oel7:
     roles:
-      - server
+      - linux
       - default
     platform:   el-7-x86_64
     box:        onyxpoint/oel-7-x86_64
     hypervisor: <%= hypervisor %>
 
-  oel6:
-    roles:
-      - client
-    platform:   el-6-x86_64
-    box:        onyxpoint/oel-6-x86_64
-    hypervisor: <%= hypervisor %>
-
-  oel8:
-    roles:
-      - client
-    platform:   el-8-x86_64
-    box:        generic/oracle8
-    hypervisor: <%= hypervisor %>
-
 CONFIG:
   log_level: verbose
   type: aio

data/spec/acceptance/nodesets/oel8.yml

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

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

@@ -23,6 +23,13 @@ describe 'look out muppets' do
       end
 
       it 'should collect valid fact data' do
+        # Delete NAT interface so facter does not report randomly generated ip addresses
+        if fact_on(host, 'ipaddress_eth1') != '' and fact_on(host, 'operatingsystemmajrelease') != '6'
+          on host, 'nmcli connection delete id System\ eth1'
+        end
+        if fact_on(host, 'ipaddress_enp0s8') != '' and fact_on(host, 'operatingsystemmajrelease') != '6'
+          on host, 'nmcli connection delete id System\ enp0s8'
+        end
         # Stupid RSpec tricks
         output = on(host, 'puppet facts --render-as json').stdout
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rspec-puppet-facts
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2020-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-puppet-facts
@@ -237,7 +237,8 @@ files:
 - lib/simp/version.rb
 - spec/acceptance/nodesets/centos7.yml
 - spec/acceptance/nodesets/centos8.yml
-- spec/acceptance/nodesets/oel.yml
+- spec/acceptance/nodesets/oel7.yml
+- spec/acceptance/nodesets/oel8.yml
 - spec/acceptance/nodesets/rhel7.yml
 - spec/acceptance/nodesets/rhel8.yml
 - spec/acceptance/nodesets/win_2012r2.yml
@@ -285,9 +286,10 @@ test_files:
 - spec/acceptance/suites/default/00_default_spec.rb
 - spec/acceptance/nodesets/centos8.yml
 - spec/acceptance/nodesets/win_2012r2.yml
+- spec/acceptance/nodesets/oel8.yml
 - spec/acceptance/nodesets/centos7.yml
-- spec/acceptance/nodesets/oel.yml
 - spec/acceptance/nodesets/rhel8.yml
+- spec/acceptance/nodesets/oel7.yml
 - spec/acceptance/nodesets/rhel7.yml
 - spec/simp_rspec_puppet_facts_spec.rb
 - facts/1.7/oraclelinux-7-x86_64.facts