simp-rspec-puppet-facts 2.3.0 → 2.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (15) hide show
  1. checksums.yaml +4 -4
  2. data/facts/2.5/centos-8-x86_64.facts +1053 -0
  3. data/facts/2.5/redhat-7-x86_64.facts +746 -380
  4. data/facts/2.5/redhat-8-x86_64.facts +1055 -0
  5. data/lib/simp/version.rb +1 -1
  6. data/spec/acceptance/nodesets/centos7.yml +23 -0
  7. data/spec/acceptance/nodesets/centos8.yml +23 -0
  8. data/spec/acceptance/nodesets/rhel7.yml +1 -19
  9. data/spec/acceptance/nodesets/rhel8.yml +1 -19
  10. data/spec/acceptance/{suites/default/nodesets/default.yml → nodesets/win_2012r2.yml} +0 -1
  11. data/spec/acceptance/suites/default/00_default_spec.rb +6 -2
  12. data/spec/acceptance/suites/default/nodesets +1 -0
  13. data/spec/spec_helper_acceptance.rb +1 -21
  14. metadata +14 -6
  15. data/spec/acceptance/nodesets/default.yml +0 -87
data/lib/simp/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Simp; end
2
2
  module Simp::RspecPuppetFacts
3
- VERSION = '2.3.0'
3
+ VERSION = '2.3.1'
4
4
  end
data/spec/acceptance/nodesets/centos7.yml ADDED
@@ -0,0 +1,23 @@
1
+ <%
2
+ if ENV['BEAKER_HYPERVISOR']
3
+ hypervisor = ENV['BEAKER_HYPERVISOR']
4
+ else
5
+ hypervisor = 'vagrant'
6
+ end
7
+ -%>
8
+ HOSTS:
9
+ el7:
10
+ roles:
11
+ - linux
12
+ - default
13
+ platform: el-7-x86_64
14
+ box: centos/7
15
+ hypervisor: <%= hypervisor %>
16
+
17
+ CONFIG:
18
+ validate: false
19
+ log_level: verbose
20
+ type: aio
21
+ <% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
22
+ puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
23
+ <% end -%>
data/spec/acceptance/nodesets/centos8.yml ADDED
@@ -0,0 +1,23 @@
1
+ <%
2
+ if ENV['BEAKER_HYPERVISOR']
3
+ hypervisor = ENV['BEAKER_HYPERVISOR']
4
+ else
5
+ hypervisor = 'vagrant'
6
+ end
7
+ -%>
8
+ HOSTS:
9
+ el8:
10
+ roles:
11
+ - linux
12
+ - default
13
+ platform: el-8-x86_64
14
+ box: generic/centos8
15
+ hypervisor: <%= hypervisor %>
16
+
17
+ CONFIG:
18
+ validate: false
19
+ log_level: verbose
20
+ type: aio
21
+ <% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
22
+ puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
23
+ <% end -%>
data/spec/acceptance/nodesets/rhel7.yml CHANGED
@@ -9,28 +9,10 @@ HOSTS:
9
9
  rhel7:
10
10
  roles:
11
11
  - linux
12
+ - default
12
13
  platform: el-7-x86_64
13
14
  box: generic/rhel7
14
15
  hypervisor: <%= hypervisor %>
15
- yum_repos:
16
- epel:
17
- mirrorlist: 'https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch'
18
- gpgkeys:
19
- - https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
20
- simp:
21
- baseurl: 'https://packagecloud.io/simp-project/6_X/el/$releasever/$basearch'
22
- gpgkeys:
23
- - https://raw.githubusercontent.com/NationalSecurityAgency/SIMP/master/GPGKEYS/RPM-GPG-KEY-SIMP
24
- - https://download.simp-project.com/simp/GPGKEYS/RPM-GPG-KEY-SIMP-6
25
- simp_dependencies:
26
- baseurl: 'https://packagecloud.io/simp-project/6_X_Dependencies/el/$releasever/$basearch'
27
- gpgkeys:
28
- - https://raw.githubusercontent.com/NationalSecurityAgency/SIMP/master/GPGKEYS/RPM-GPG-KEY-SIMP
29
- - https://download.simp-project.com/simp/GPGKEYS/RPM-GPG-KEY-SIMP-6
30
- - https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
31
- - https://yum.puppetlabs.com/RPM-GPG-KEY-puppet
32
- - https://apt.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-94
33
- - https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
34
16
 
35
17
  CONFIG:
36
18
  validate: false
data/spec/acceptance/nodesets/rhel8.yml CHANGED
@@ -8,29 +8,11 @@
8
8
  HOSTS:
9
9
  rhel8:
10
10
  roles:
11
+ - default
11
12
  - linux
12
13
  platform: el-8-x86_64
13
14
  box: generic/rhel8
14
15
  hypervisor: <%= hypervisor %>
15
- yum_repos:
16
- epel:
17
- mirrorlist: 'https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch'
18
- gpgkeys:
19
- - https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
20
- simp:
21
- baseurl: 'https://packagecloud.io/simp-project/6_X/el/$releasever/$basearch'
22
- gpgkeys:
23
- - https://raw.githubusercontent.com/NationalSecurityAgency/SIMP/master/GPGKEYS/RPM-GPG-KEY-SIMP
24
- - https://download.simp-project.com/simp/GPGKEYS/RPM-GPG-KEY-SIMP-6
25
- simp_dependencies:
26
- baseurl: 'https://packagecloud.io/simp-project/6_X_Dependencies/el/$releasever/$basearch'
27
- gpgkeys:
28
- - https://raw.githubusercontent.com/NationalSecurityAgency/SIMP/master/GPGKEYS/RPM-GPG-KEY-SIMP
29
- - https://download.simp-project.com/simp/GPGKEYS/RPM-GPG-KEY-SIMP-6
30
- - https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
31
- - https://yum.puppetlabs.com/RPM-GPG-KEY-puppet
32
- - https://apt.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-94
33
- - https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
34
16
 
35
17
  CONFIG:
36
18
  log_level: verbose
data/spec/acceptance/{suites/default/nodesets/default.yml → nodesets/win_2012r2.yml} RENAMED
@@ -10,7 +10,6 @@ HOSTS:
10
10
  roles:
11
11
  - windows
12
12
  platform: windows-server-amd64
13
- #box: gusztavvargadr/windows-server
14
13
  box: opentable/win-2012r2-standard-amd64-nocm
15
14
  hypervisor: <%= hypervisor %>
16
15
  vagrant_memsize: 2048
data/spec/acceptance/suites/default/00_default_spec.rb CHANGED
@@ -18,11 +18,15 @@ describe 'look out muppets' do
18
18
  @output = []
19
19
  end
20
20
 
21
+ it 'should install the simp_core module' do
22
+ on(host, 'puppet module install simp/simp_core')
23
+ end
24
+
21
25
  it 'should collect valid fact data' do
22
26
  # Stupid RSpec tricks
23
- output = on(host, 'facter -p --json').stdout
27
+ output = on(host, 'puppet facts --render-as json').stdout
24
28
 
25
- expect{@output << JSON.parse(output)}.to_not raise_error
29
+ expect{@output << JSON.parse(output)['values']}.to_not raise_error
26
30
  end
27
31
 
28
32
  # This should work regardless of OS
data/spec/acceptance/suites/default/nodesets ADDED
@@ -0,0 +1 @@
1
+ spec/acceptance/suites/default/../../nodesets
data/spec/spec_helper_acceptance.rb CHANGED
@@ -2,7 +2,6 @@ require 'beaker-rspec'
2
2
  require 'tmpdir'
3
3
  require 'yaml'
4
4
  require 'simp/beaker_helpers'
5
-
6
5
  include Simp::BeakerHelpers
7
6
 
8
7
  require 'beaker/puppet_install_helper'
@@ -24,7 +23,7 @@ unless ENV['BEAKER_provision'] == 'no'
24
23
  end
25
24
 
26
25
  hosts.each do |host|
27
- # https://petersouter.co.uk/testing-windows-puppet-with-beaker/
26
+ # https://petersouter.xyz/testing-windows-with-beaker-without-cygwin/
28
27
  case host['platform']
29
28
  when /windows/
30
29
  GEOTRUST_GLOBAL_CA = <<-EOM.freeze
@@ -66,25 +65,6 @@ RSpec.configure do |c|
66
65
  begin
67
66
  # Install modules and dependencies from spec/fixtures/modules
68
67
  copy_fixture_modules_to( hosts )
69
-
70
- nonwin = hosts.dup
71
- nonwin.delete_if {|h| h[:platform] =~ /windows/ }
72
-
73
- unless nonwin.empty?
74
- begin
75
- server = only_host_with_role(nonwin, 'server')
76
- rescue ArgumentError => e
77
- server = hosts_with_role(nonwin, 'default').first
78
- end
79
- # Generate and install PKI certificates on each SUT
80
- Dir.mktmpdir do |cert_dir|
81
- run_fake_pki_ca_on(server, nonwin, cert_dir )
82
- nonwin.each{ |sut| copy_pki_to( sut, cert_dir, '/etc/pki/simp-testing' )}
83
- end
84
-
85
- # add PKI keys
86
- copy_keydist_to(server)
87
- end
88
68
  rescue StandardError, ScriptError => e
89
69
  if ENV['PRY']
90
70
  require 'pry'; binding.pry
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.3.0
4
+ version: 2.3.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-08-22 00:00:00.000000000 Z
12
+ date: 2019-11-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec-puppet-facts
@@ -176,10 +176,12 @@ files:
176
176
  - facts/2.4/redhat-7-x86_64.facts
177
177
  - facts/2.5/centos-6-x86_64.facts
178
178
  - facts/2.5/centos-7-x86_64.facts
179
+ - facts/2.5/centos-8-x86_64.facts
179
180
  - facts/2.5/oraclelinux-6-x86_64.facts
180
181
  - facts/2.5/oraclelinux-7-x86_64.facts
181
182
  - facts/2.5/redhat-6-x86_64.facts
182
183
  - facts/2.5/redhat-7-x86_64.facts
184
+ - facts/2.5/redhat-8-x86_64.facts
183
185
  - facts/2.5/windows-server_2012_r2-x86_64.facts
184
186
  - facts/3.0/centos-6-x86_64.facts
185
187
  - facts/3.0/centos-7-x86_64.facts
@@ -232,12 +234,14 @@ files:
232
234
  - lib/simp-rspec-puppet-facts.rb
233
235
  - lib/simp/rspec-puppet-facts.rb
234
236
  - lib/simp/version.rb
235
- - spec/acceptance/nodesets/default.yml
237
+ - spec/acceptance/nodesets/centos7.yml
238
+ - spec/acceptance/nodesets/centos8.yml
236
239
  - spec/acceptance/nodesets/oel.yml
237
240
  - spec/acceptance/nodesets/rhel7.yml
238
241
  - spec/acceptance/nodesets/rhel8.yml
242
+ - spec/acceptance/nodesets/win_2012r2.yml
239
243
  - spec/acceptance/suites/default/00_default_spec.rb
240
- - spec/acceptance/suites/default/nodesets/default.yml
244
+ - spec/acceptance/suites/default/nodesets
241
245
  - spec/data_normalization_spec.rb
242
246
  - spec/fixtures/metadata.json
243
247
  - spec/fixtures/metadata.json_with_missing_operatingsystem_support
@@ -276,9 +280,11 @@ test_files:
276
280
  - spec/data_normalization_spec.rb
277
281
  - spec/spec_helper.rb
278
282
  - spec/spec_helper_acceptance.rb
279
- - spec/acceptance/suites/default/nodesets/default.yml
283
+ - spec/acceptance/suites/default/nodesets
280
284
  - spec/acceptance/suites/default/00_default_spec.rb
281
- - spec/acceptance/nodesets/default.yml
285
+ - spec/acceptance/nodesets/centos8.yml
286
+ - spec/acceptance/nodesets/win_2012r2.yml
287
+ - spec/acceptance/nodesets/centos7.yml
282
288
  - spec/acceptance/nodesets/oel.yml
283
289
  - spec/acceptance/nodesets/rhel8.yml
284
290
  - spec/acceptance/nodesets/rhel7.yml
@@ -361,7 +367,9 @@ test_files:
361
367
  - facts/3.3/centos-6-x86_64.facts
362
368
  - facts/3.3/oraclelinux-6-x86_64.facts
363
369
  - facts/Vagrantfile
370
+ - facts/2.5/redhat-8-x86_64.facts
364
371
  - facts/2.5/oraclelinux-7-x86_64.facts
372
+ - facts/2.5/centos-8-x86_64.facts
365
373
  - facts/2.5/centos-7-x86_64.facts
366
374
  - facts/2.5/redhat-7-x86_64.facts
367
375
  - facts/2.5/redhat-6-x86_64.facts
data/spec/acceptance/nodesets/default.yml DELETED
@@ -1,87 +0,0 @@
1
- <%
2
- if ENV['BEAKER_HYPERVISOR']
3
- hypervisor = ENV['BEAKER_HYPERVISOR']
4
- else
5
- hypervisor = 'vagrant'
6
- end
7
- -%>
8
- HOSTS:
9
- el7:
10
- roles:
11
- - linux
12
- platform: el-7-x86_64
13
- box: centos/7
14
- hypervisor: <%= hypervisor %>
15
- yum_repos:
16
- updates:
17
- baseurl: 'http://mirror.centos.org/centos/$releasever/os/$basearch/'
18
- gpgkeys:
19
- - https://www.centos.org/keys/RPM-GPG-KEY-CentOS-7
20
- epel:
21
- mirrorlist: 'https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch'
22
- gpgkeys:
23
- - https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
24
- simp:
25
- baseurl: 'https://packagecloud.io/simp-project/6_X/el/$releasever/$basearch'
26
- gpgkeys:
27
- - https://raw.githubusercontent.com/NationalSecurityAgency/SIMP/master/GPGKEYS/RPM-GPG-KEY-SIMP
28
- - https://download.simp-project.com/simp/GPGKEYS/RPM-GPG-KEY-SIMP-6
29
- simp_dependencies:
30
- baseurl: 'https://packagecloud.io/simp-project/6_X_Dependencies/el/$releasever/$basearch'
31
- gpgkeys:
32
- - https://raw.githubusercontent.com/NationalSecurityAgency/SIMP/master/GPGKEYS/RPM-GPG-KEY-SIMP
33
- - https://download.simp-project.com/simp/GPGKEYS/RPM-GPG-KEY-SIMP-6
34
- - https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
35
- - https://yum.puppetlabs.com/RPM-GPG-KEY-puppet
36
- - https://apt.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-94
37
- - https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
38
-
39
- el6:
40
- roles:
41
- - linux
42
- platform: el-6-x86_64
43
- box: centos/6
44
- hypervisor: <%= hypervisor %>
45
- yum_repos:
46
- updates:
47
- baseurl: 'http://mirror.centos.org/centos/$releasever/os/$basearch/'
48
- gpgkeys:
49
- - https://www.centos.org/keys/RPM-GPG-KEY-CentOS-6
50
- epel:
51
- mirrorlist: 'https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch'
52
- gpgkeys:
53
- - https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6
54
- simp:
55
- baseurl: 'https://packagecloud.io/simp-project/6_X/el/$releasever/$basearch'
56
- gpgkeys:
57
- - https://raw.githubusercontent.com/NationalSecurityAgency/SIMP/master/GPGKEYS/RPM-GPG-KEY-SIMP
58
- - https://download.simp-project.com/simp/GPGKEYS/RPM-GPG-KEY-SIMP-6
59
- simp_dependencies:
60
- baseurl: 'https://packagecloud.io/simp-project/6_X_Dependencies/el/$releasever/$basearch'
61
- gpgkeys:
62
- - https://raw.githubusercontent.com/NationalSecurityAgency/SIMP/master/GPGKEYS/RPM-GPG-KEY-SIMP
63
- - https://download.simp-project.com/simp/GPGKEYS/RPM-GPG-KEY-SIMP-6
64
- - https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
65
- - https://yum.puppetlabs.com/RPM-GPG-KEY-puppet
66
- - https://apt.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-94
67
- - https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6
68
-
69
- win2012r2:
70
- roles:
71
- - windows
72
- platform: windows-server-amd64
73
- #box: gusztavvargadr/windows-server
74
- box: opentable/win-2012r2-standard-amd64-nocm
75
- hypervisor: <%= hypervisor %>
76
- vagrant_memsize: 2048
77
- vagrant_cpus: 2
78
- user: vagrant
79
- communicator: winrm
80
- is_cygwin: false
81
-
82
- CONFIG:
83
- log_level: verbose
84
- type: aio
85
- <% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
86
- puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
87
- <% end -%>