simp-beaker-helpers 1.18.4 → 1.18.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -1
- data/lib/simp/beaker_helpers.rb +10 -0
- data/lib/simp/beaker_helpers/ssg.rb +35 -0
- data/lib/simp/beaker_helpers/version.rb +1 -1
- data/spec/acceptance/suites/default/nodesets +1 -1
- data/spec/acceptance/suites/fips_from_fixtures/nodesets +1 -1
- data/spec/acceptance/suites/snapshot/nodesets +1 -1
- metadata +33 -5
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 61d12b13fa50d08e1339a1a4fe27103670ce3f369f5d2ac65aed3203ee924a52
|
|
4
|
+
data.tar.gz: 32c08fe4e85b561deeb9b917f3b7455cc74c03d2616a3b76e329c43534163458
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 686bf937e45adb225342bf010bc3294f055d2582ce2724af3c9b0aa20674e09802ebf4cb3a2a54ff1e4f0bee69f91f64ffa063dbaba2d6a50f77c40dc60b8710
|
|
7
|
+
data.tar.gz: 52e02fadd4f89d9b3249e6945a170b8f20e24c1b8652ffab61abaa75cc699006883f928172aadad94c258683605e2714bc2ed7904778ca39e1128c1a44972642
|
data/CHANGELOG.md
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
### 1.18.
|
|
1
|
+
### 1.18.5 / 2020-06-24
|
|
2
|
+
* Allow Vagrant to connect to EL8+ hosts in FIPS mode
|
|
3
|
+
* Add EL8 support to the SSG scans
|
|
4
|
+
|
|
5
|
+
### 1.18.4 / 2020-03-31
|
|
2
6
|
* Fix capturing error messages when inspec fails to generate results
|
|
3
7
|
|
|
4
8
|
### 1.18.3 / 2020-02-24
|
data/lib/simp/beaker_helpers.rb
CHANGED
|
@@ -327,6 +327,16 @@ module Simp::BeakerHelpers
|
|
|
327
327
|
|
|
328
328
|
# Enable FIPS and then reboot to finish.
|
|
329
329
|
on(sut, %(puppet apply --verbose #{fips_enable_modulepath} -e "class { 'fips': enabled => true }"))
|
|
330
|
+
|
|
331
|
+
# Work around Vagrant and cipher restrictions in EL8+
|
|
332
|
+
#
|
|
333
|
+
# Hopefully, Vagrant will update the used ciphers at some point but who
|
|
334
|
+
# knows when that will be
|
|
335
|
+
opensshserver_config = '/etc/crypto-policies/back-ends/opensshserver.config'
|
|
336
|
+
if file_exists_on(host, opensshserver_config)
|
|
337
|
+
on(host, "sed --follow-symlinks -i 's/PubkeyAcceptedKeyTypes=/PubkeyAcceptedKeyTypes=ssh-rsa,/' #{opensshserver_config}")
|
|
338
|
+
end
|
|
339
|
+
|
|
330
340
|
sut.reboot
|
|
331
341
|
end
|
|
332
342
|
end
|
|
@@ -29,6 +29,17 @@ module Simp::BeakerHelpers
|
|
|
29
29
|
'python-jinja2'
|
|
30
30
|
]
|
|
31
31
|
|
|
32
|
+
EL8_PACKAGES = [
|
|
33
|
+
'python3',
|
|
34
|
+
'python3-pyyaml',
|
|
35
|
+
'cmake',
|
|
36
|
+
'git',
|
|
37
|
+
'openscap-python3',
|
|
38
|
+
'openscap-utils',
|
|
39
|
+
'python3-lxml',
|
|
40
|
+
'python3-jinja2'
|
|
41
|
+
]
|
|
42
|
+
|
|
32
43
|
OS_INFO = {
|
|
33
44
|
'RedHat' => {
|
|
34
45
|
'6' => {
|
|
@@ -46,6 +57,14 @@ module Simp::BeakerHelpers
|
|
|
46
57
|
'build_target' => 'rhel7',
|
|
47
58
|
'datastream' => 'ssg-rhel7-ds.xml'
|
|
48
59
|
}
|
|
60
|
+
},
|
|
61
|
+
'8' => {
|
|
62
|
+
'required_packages' => EL8_PACKAGES,
|
|
63
|
+
'ssg' => {
|
|
64
|
+
'profile_target' => 'rhel8',
|
|
65
|
+
'build_target' => 'rhel8',
|
|
66
|
+
'datastream' => 'ssg-rhel8-ds.xml'
|
|
67
|
+
}
|
|
49
68
|
}
|
|
50
69
|
},
|
|
51
70
|
'CentOS' => {
|
|
@@ -64,6 +83,14 @@ module Simp::BeakerHelpers
|
|
|
64
83
|
'build_target' => 'centos7',
|
|
65
84
|
'datastream' => 'ssg-centos7-ds.xml'
|
|
66
85
|
}
|
|
86
|
+
},
|
|
87
|
+
'8' => {
|
|
88
|
+
'required_packages' => EL8_PACKAGES,
|
|
89
|
+
'ssg' => {
|
|
90
|
+
'profile_target' => 'rhel8',
|
|
91
|
+
'build_target' => 'centos8',
|
|
92
|
+
'datastream' => 'ssg-centos8-ds.xml'
|
|
93
|
+
}
|
|
67
94
|
}
|
|
68
95
|
},
|
|
69
96
|
'OracleLinux' => {
|
|
@@ -73,8 +100,16 @@ module Simp::BeakerHelpers
|
|
|
73
100
|
'profile_target' => 'ol7',
|
|
74
101
|
'build_target' => 'ol7',
|
|
75
102
|
'datastream' => 'ssg-ol7-ds.xml'
|
|
103
|
+
},
|
|
104
|
+
'8' => {
|
|
105
|
+
'required_packages' => EL8_PACKAGES,
|
|
106
|
+
'ssg' => {
|
|
107
|
+
'profile_target' => 'ol8',
|
|
108
|
+
'build_target' => 'ol8',
|
|
109
|
+
'datastream' => 'ssg-ol8-ds.xml'
|
|
76
110
|
}
|
|
77
111
|
}
|
|
112
|
+
}
|
|
78
113
|
}
|
|
79
114
|
}
|
|
80
115
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
../../nodesets
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
../../nodesets
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
../../nodesets
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: simp-beaker-helpers
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.18.
|
|
4
|
+
version: 1.18.5
|
|
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: 2020-
|
|
12
|
+
date: 2020-06-24 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: beaker
|
|
@@ -235,9 +235,37 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
235
235
|
- !ruby/object:Gem::Version
|
|
236
236
|
version: '0'
|
|
237
237
|
requirements: []
|
|
238
|
-
|
|
239
|
-
rubygems_version: 2.7.7
|
|
238
|
+
rubygems_version: 3.0.6
|
|
240
239
|
signing_key:
|
|
241
240
|
specification_version: 4
|
|
242
241
|
summary: beaker helper methods for SIMP
|
|
243
|
-
test_files:
|
|
242
|
+
test_files:
|
|
243
|
+
- spec/acceptance/nodesets/default.yml
|
|
244
|
+
- spec/acceptance/suites/default/check_puppet_version_spec.rb
|
|
245
|
+
- spec/acceptance/suites/default/enable_fips_spec.rb
|
|
246
|
+
- spec/acceptance/suites/default/fixture_modules_spec.rb
|
|
247
|
+
- spec/acceptance/suites/default/install_simp_deps_repo_spec.rb
|
|
248
|
+
- spec/acceptance/suites/default/nodesets
|
|
249
|
+
- spec/acceptance/suites/default/pki_tests_spec.rb
|
|
250
|
+
- spec/acceptance/suites/default/set_hieradata_on_spec.rb
|
|
251
|
+
- spec/acceptance/suites/default/write_hieradata_to_spec.rb
|
|
252
|
+
- spec/acceptance/suites/fips_from_fixtures/00_default_spec.rb
|
|
253
|
+
- spec/acceptance/suites/fips_from_fixtures/metadata.yml
|
|
254
|
+
- spec/acceptance/suites/fips_from_fixtures/nodesets
|
|
255
|
+
- spec/acceptance/suites/offline/00_default_spec.rb
|
|
256
|
+
- spec/acceptance/suites/offline/README
|
|
257
|
+
- spec/acceptance/suites/offline/nodesets/default.yml
|
|
258
|
+
- spec/acceptance/suites/puppet_collections/00_default_spec.rb
|
|
259
|
+
- spec/acceptance/suites/puppet_collections/metadata.yml
|
|
260
|
+
- spec/acceptance/suites/puppet_collections/nodesets/default.yml
|
|
261
|
+
- spec/acceptance/suites/snapshot/00_snapshot_test_spec.rb
|
|
262
|
+
- spec/acceptance/suites/snapshot/10_general_usage_spec.rb
|
|
263
|
+
- spec/acceptance/suites/snapshot/nodesets
|
|
264
|
+
- spec/acceptance/suites/windows/00_default_spec.rb
|
|
265
|
+
- spec/acceptance/suites/windows/metadata.yml
|
|
266
|
+
- spec/acceptance/suites/windows/nodesets/default.yml
|
|
267
|
+
- spec/acceptance/suites/windows/nodesets/win2016.yml
|
|
268
|
+
- spec/acceptance/suites/windows/nodesets/win2019.yml
|
|
269
|
+
- spec/lib/simp/beaker_helpers_spec.rb
|
|
270
|
+
- spec/spec_helper.rb
|
|
271
|
+
- spec/spec_helper_acceptance.rb
|