Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openssh-formula
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
salt
openssh-formula
Commits
de969f10
Unverified
Commit
de969f10
authored
4 years ago
by
Imran Iqbal
Browse files
Options
Downloads
Patches
Plain Diff
test(share): standardise with latest changes [skip ci]
* Automated using
https://github.com/myii/ssf-formula/pull/288
parent
e0453691
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
test/integration/share/README.md
+2
-1
2 additions, 1 deletion
test/integration/share/README.md
test/integration/share/libraries/system.rb
+7
-8
7 additions, 8 deletions
test/integration/share/libraries/system.rb
with
9 additions
and
9 deletions
test/integration/share/README.md
+
2
−
1
View file @
de969f10
...
...
@@ -13,9 +13,10 @@ The `system` library provides easy access to system dependent information:
-
`system.platform`
: based on
`inspec.platform`
, modify to values that are more consistent from a SaltStack perspective
-
`system.platform[:family]`
provide a family name for Arch and Gentoo
-
`system.platform[:name]`
append
`linux`
to both
`amazon`
and
`oracle`
; ensure Windows platforms are resolved as simply
`windows`
-
`system.platform[:release]`
tweak Arch, Amazon Linux, Gentoo and Windows:
-
`system.platform[:release]`
tweak Arch, Amazon Linux, Gentoo
, openSUSE
and Windows:
-
`Arch`
is always
`base-latest`
-
`Amazon Linux`
release
`2018`
is resolved as
`1`
-
`Gentoo`
release is trimmed to its major version number and then the init system is appended (i.e.
`sysv`
or
`sysd`
)
-
`openSUSE`
is resolved as
`tumbleweed`
if the
`platform[:release]`
is in date format
-
`Windows`
uses the widely-used release number (e.g.
`8.1`
or
`2019-server`
) in place of the actual system release version
-
`system.platform[:finger]`
is the concatenation of the name and the major release number (except for Ubuntu, which gives
`ubuntu-20.04`
for example)
This diff is collapsed.
Click to expand it.
test/integration/share/libraries/system.rb
+
7
−
8
View file @
de969f10
...
...
@@ -45,7 +45,7 @@ class SystemResource < Inspec.resource(1)
end
end
# rubocop:disable Metrics/MethodLength
# rubocop:disable Metrics/MethodLength
,Metrics/AbcSize,Metrics/CyclomaticComplexity
def
build_platform_release
case
inspec
.
platform
[
:name
]
when
'amazon'
...
...
@@ -55,6 +55,10 @@ class SystemResource < Inspec.resource(1)
'base-latest'
when
'gentoo'
"
#{
inspec
.
platform
[
:release
].
split
(
'.'
)[
0
]
}
-
#{
derive_gentoo_init_system
}
"
when
'opensuse'
# rubocop:disable Style/NumericLiterals,Layout/LineLength
inspec
.
platform
[
:release
].
to_i
>
20210101
?
'tumbleweed'
:
inspec
.
platform
[
:release
]
# rubocop:enable Style/NumericLiterals,Layout/LineLength
when
'windows_8.1_pro'
'8.1'
when
'windows_server_2019_datacenter'
...
...
@@ -63,15 +67,10 @@ class SystemResource < Inspec.resource(1)
inspec
.
platform
[
:release
]
end
end
# rubocop:enable Metrics/MethodLength
# rubocop:enable Metrics/MethodLength
,Metrics/AbcSize,Metrics/CyclomaticComplexity
def
derive_gentoo_init_system
case
inspec
.
command
(
'systemctl'
).
exist?
when
true
'sysd'
else
'sysv'
end
inspec
.
command
(
'systemctl'
).
exist?
?
'sysd'
:
'sysv'
end
def
build_platform_finger
...
...
This diff is collapsed.
Click to expand it.
Dennis Ahrens
@ahrensde
mentioned in commit
48d53974
·
3 years ago
mentioned in commit
48d53974
mentioned in commit 48d539746d68f1ec52509edd82544c569ed43b9d
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment