simp-rspec-puppet-facts 2.4.0 → 2.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,4 @@
1
1
  module Simp; end
2
2
  module Simp::RspecPuppetFacts
3
- VERSION = '2.4.0'
3
+ VERSION = '2.4.1'
4
4
  end
@@ -8,26 +8,12 @@
8
8
  HOSTS:
9
9
  oel7:
10
10
  roles:
11
- - server
11
+ - linux
12
12
  - default
13
13
  platform: el-7-x86_64
14
14
  box: onyxpoint/oel-7-x86_64
15
15
  hypervisor: <%= hypervisor %>
16
16
 
17
- oel6:
18
- roles:
19
- - client
20
- platform: el-6-x86_64
21
- box: onyxpoint/oel-6-x86_64
22
- hypervisor: <%= hypervisor %>
23
-
24
- oel8:
25
- roles:
26
- - client
27
- platform: el-8-x86_64
28
- box: generic/oracle8
29
- hypervisor: <%= hypervisor %>
30
-
31
17
  CONFIG:
32
18
  log_level: verbose
33
19
  type: aio
@@ -0,0 +1,22 @@
1
+ <%
2
+ if ENV['BEAKER_HYPERVISOR']
3
+ hypervisor = ENV['BEAKER_HYPERVISOR']
4
+ else
5
+ hypervisor = 'vagrant'
6
+ end
7
+ -%>
8
+ HOSTS:
9
+ oel8:
10
+ roles:
11
+ - linux
12
+ - default
13
+ platform: el-8-x86_64
14
+ box: generic/oracle8
15
+ hypervisor: <%= hypervisor %>
16
+
17
+ CONFIG:
18
+ log_level: verbose
19
+ type: aio
20
+ <% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
21
+ puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
22
+ <% end -%>
@@ -23,6 +23,13 @@ describe 'look out muppets' do
23
23
  end
24
24
 
25
25
  it 'should collect valid fact data' do
26
+ # Delete NAT interface so facter does not report randomly generated ip addresses
27
+ if fact_on(host, 'ipaddress_eth1') != '' and fact_on(host, 'operatingsystemmajrelease') != '6'
28
+ on host, 'nmcli connection delete id System\ eth1'
29
+ end
30
+ if fact_on(host, 'ipaddress_enp0s8') != '' and fact_on(host, 'operatingsystemmajrelease') != '6'
31
+ on host, 'nmcli connection delete id System\ enp0s8'
32
+ end
26
33
  # Stupid RSpec tricks
27
34
  output = on(host, 'puppet facts --render-as json').stdout
28
35
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: simp-rspec-puppet-facts
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.4.0
4
+ version: 2.4.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2019-12-10 00:00:00.000000000 Z
12
+ date: 2020-01-15 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec-puppet-facts
@@ -237,7 +237,8 @@ files:
237
237
  - lib/simp/version.rb
238
238
  - spec/acceptance/nodesets/centos7.yml
239
239
  - spec/acceptance/nodesets/centos8.yml
240
- - spec/acceptance/nodesets/oel.yml
240
+ - spec/acceptance/nodesets/oel7.yml
241
+ - spec/acceptance/nodesets/oel8.yml
241
242
  - spec/acceptance/nodesets/rhel7.yml
242
243
  - spec/acceptance/nodesets/rhel8.yml
243
244
  - spec/acceptance/nodesets/win_2012r2.yml
@@ -285,9 +286,10 @@ test_files:
285
286
  - spec/acceptance/suites/default/00_default_spec.rb
286
287
  - spec/acceptance/nodesets/centos8.yml
287
288
  - spec/acceptance/nodesets/win_2012r2.yml
289
+ - spec/acceptance/nodesets/oel8.yml
288
290
  - spec/acceptance/nodesets/centos7.yml
289
- - spec/acceptance/nodesets/oel.yml
290
291
  - spec/acceptance/nodesets/rhel8.yml
292
+ - spec/acceptance/nodesets/oel7.yml
291
293
  - spec/acceptance/nodesets/rhel7.yml
292
294
  - spec/simp_rspec_puppet_facts_spec.rb
293
295
  - facts/1.7/oraclelinux-7-x86_64.facts