1
0
Fork 0

test: standardise use of `share` suite & `_mapdata` state [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/302
This commit is contained in:
Imran Iqbal 2021-03-23 21:33:36 +00:00
parent 32e3825e63
commit e58973f6a7
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
5 changed files with 8 additions and 4 deletions

View File

@ -7,7 +7,7 @@ Layout/LineLength:
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
Max: 88
Metrics/BlockLength:
ExcludedMethods:
IgnoredMethods:
- control
- describe
# Increase from default of `25`

View File

@ -5,7 +5,7 @@ source 'https://rubygems.org'
# Use the latest version of `inspec` prior to `4.23.4`, which introduces a
# regression where the diff isn't displayed when comparing using `eq`.
gem 'inspec', '~> 4.22.22'
# Install the `kitchen-docker` gem from GitHub because the latest version
# Install the `kitchen-docker` gem using `git` because the latest version
# currently available (`2.10.0`) doesn't include a recent fix for Gentoo.
# rubocop:disable Layout/LineLength
gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'

View File

@ -17,6 +17,7 @@ supports:
- platform-name: opensuse
- platform-name: suse
- platform-name: freebsd
- platform-name: openbsd
- platform-name: amazon
- platform-name: oracle
- platform-name: arch

View File

@ -14,6 +14,7 @@ supports:
- platform-name: opensuse
- platform-name: suse
- platform-name: freebsd
- platform-name: openbsd
- platform-name: amazon
- platform-name: oracle
- platform-name: arch

View File

@ -38,8 +38,8 @@ class SystemResource < Inspec.resource(1)
case inspec.platform[:name]
when 'amazon', 'oracle'
"#{inspec.platform[:name]}linux"
when 'windows_8.1_pro', 'windows_server_2019_datacenter'
'windows'
when /^windows_/
inspec.platform[:family]
else
inspec.platform[:name]
end
@ -63,6 +63,8 @@ class SystemResource < Inspec.resource(1)
'8.1'
when 'windows_server_2019_datacenter'
'2019-server'
when 'windows_server_2016_datacenter'
'2016-server'
else
inspec.platform[:release]
end