File tree 5 files changed +8
-4
lines changed
5 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ Layout/LineLength:
7
7
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
8
8
Max : 88
9
9
Metrics/BlockLength :
10
- ExcludedMethods :
10
+ IgnoredMethods :
11
11
- control
12
12
- describe
13
13
# Increase from default of `25`
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ source 'https://rubygems.org'
5
5
# Use the latest version of `inspec` prior to `4.23.4`, which introduces a
6
6
# regression where the diff isn't displayed when comparing using `eq`.
7
7
gem 'inspec' , '~> 4.22.22'
8
- # Install the `kitchen-docker` gem from GitHub because the latest version
8
+ # Install the `kitchen-docker` gem using `git` because the latest version
9
9
# currently available (`2.10.0`) doesn't include a recent fix for Gentoo.
10
10
# rubocop:disable Layout/LineLength
11
11
gem 'kitchen-docker' , git : 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker' , branch : 'ssf'
Original file line number Diff line number Diff line change @@ -18,6 +18,7 @@ supports:
18
18
- platform-name : opensuse
19
19
- platform-name : suse
20
20
- platform-name : freebsd
21
+ - platform-name : openbsd
21
22
- platform-name : amazon
22
23
- platform-name : oracle
23
24
- platform-name : arch
Original file line number Diff line number Diff line change @@ -14,6 +14,7 @@ supports:
14
14
- platform-name : opensuse
15
15
- platform-name : suse
16
16
- platform-name : freebsd
17
+ - platform-name : openbsd
17
18
- platform-name : amazon
18
19
- platform-name : oracle
19
20
- platform-name : arch
Original file line number Diff line number Diff line change @@ -38,8 +38,8 @@ def build_platform_name
38
38
case inspec . platform [ :name ]
39
39
when 'amazon' , 'oracle'
40
40
"#{ inspec . platform [ :name ] } linux"
41
- when 'windows_8.1_pro' , 'windows_server_2019_datacenter'
42
- 'windows'
41
+ when /^windows_/
42
+ inspec . platform [ :family ]
43
43
else
44
44
inspec . platform [ :name ]
45
45
end
@@ -63,6 +63,8 @@ def build_platform_release
63
63
'8.1'
64
64
when 'windows_server_2019_datacenter'
65
65
'2019-server'
66
+ when 'windows_server_2016_datacenter'
67
+ '2016-server'
66
68
else
67
69
inspec . platform [ :release ]
68
70
end
You can’t perform that action at this time.
0 commit comments