karel/salt-gitea-formula
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(general): Update template

Browse Source
This commit is contained in:
jeanluc
2022-12-12 00:57:35 +01:00
parent a9fd89c85e
commit 4dfb6795ba
12 changed files with 208 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cruft.json
View File

@@ -1,6 +1,6 @@
{ {
"template": "https://github.com/lkubb/salt-template-formula", "template": "https://github.com/lkubb/salt-template-formula",
"commit": "5ad0aa5da5c005f26b247056aa8f156c3c2adfed", "commit": "9ca35064e6d6ca808ce67fde9080fd2be77dd08c",
"checkout": null, "checkout": null,
"context": { "context": {
"cookiecutter": { "cookiecutter": {

13
.gitlab-ci.yml
View File

@@ -135,6 +135,7 @@ rubocop:
# default-debian-11-tiamat-py3: {extends: '.test_instance'} # default-debian-11-tiamat-py3: {extends: '.test_instance'}
# default-debian-10-tiamat-py3: {extends: '.test_instance'} # default-debian-10-tiamat-py3: {extends: '.test_instance'}
# default-debian-9-tiamat-py3: {extends: '.test_instance'} # default-debian-9-tiamat-py3: {extends: '.test_instance'}
# default-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'}
# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} # default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
# default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} # default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
# default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'} # default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
@@ -147,13 +148,13 @@ rubocop:
default-debian-11-master-py3: {extends: '.test_instance'} default-debian-11-master-py3: {extends: '.test_instance'}
default-debian-10-master-py3: {extends: '.test_instance'} default-debian-10-master-py3: {extends: '.test_instance'}
default-debian-9-master-py3: {extends: '.test_instance'} default-debian-9-master-py3: {extends: '.test_instance'}
default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
default-ubuntu-2004-master-py3: {extends: '.test_instance'} default-ubuntu-2004-master-py3: {extends: '.test_instance'}
default-ubuntu-1804-master-py3: {extends: '.test_instance'} default-ubuntu-1804-master-py3: {extends: '.test_instance'}
default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'} default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
default-centos-7-master-py3: {extends: '.test_instance'} default-centos-7-master-py3: {extends: '.test_instance'}
default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'} default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
default-fedora-35-master-py3: {extends: '.test_instance'} default-fedora-35-master-py3: {extends: '.test_instance'}
default-fedora-34-master-py3: {extends: '.test_instance'}
default-opensuse-leap-153-master-py3: {extends: '.test_instance'} default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'} default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
default-amazonlinux-2-master-py3: {extends: '.test_instance'} default-amazonlinux-2-master-py3: {extends: '.test_instance'}
@@ -167,13 +168,13 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
# default-debian-11-3004-1-py3: {extends: '.test_instance'} # default-debian-11-3004-1-py3: {extends: '.test_instance'}
# default-debian-10-3004-1-py3: {extends: '.test_instance'} # default-debian-10-3004-1-py3: {extends: '.test_instance'}
# default-debian-9-3004-1-py3: {extends: '.test_instance'} # default-debian-9-3004-1-py3: {extends: '.test_instance'}
# default-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'}
# default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'} # default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'} # default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
# default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'} # default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
# default-centos-7-3004-1-py3: {extends: '.test_instance'} # default-centos-7-3004-1-py3: {extends: '.test_instance'}
# default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'} # default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
# default-fedora-35-3004-1-py3: {extends: '.test_instance'} # default-fedora-35-3004-1-py3: {extends: '.test_instance'}
# default-fedora-34-3004-1-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'} # default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'} # default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'} # default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
@@ -194,14 +195,6 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'} # default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'} # default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
# default-almalinux-8-3003-4-py3: {extends: '.test_instance'} # default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
# default-debian-10-3002-8-py3: {extends: '.test_instance'}
# default-debian-9-3002-8-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3002-8-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3002-8-py3: {extends: '.test_instance'}
# default-centos-7-3002-8-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3002-8-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3002-8-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3002-8-py3: {extends: '.test_instance'}
# yamllint enable rule:line-length # yamllint enable rule:line-length
############################################################################### ###############################################################################

14
.pre-commit-config.yaml
View File

@@ -3,6 +3,18 @@
--- ---
# See https://pre-commit.com for more information # See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks # See https://pre-commit.com/hooks.html for more hooks
ci:
autofix_commit_msg: |
ci(pre-commit.ci): apply auto fixes from pre-commit.com hooks
For more information, see https://pre-commit.ci
autofix_prs: true
autoupdate_branch: ''
autoupdate_commit_msg: |
ci(pre-commit.ci): perform `pre-commit` autoupdate
autoupdate_schedule: quarterly
skip: []
submodules: false
default_stages: [commit] default_stages: [commit]
repos: repos:
- repo: https://github.com/dafyddj/commitlint-pre-commit-hook - repo: https://github.com/dafyddj/commitlint-pre-commit-hook
@@ -18,7 +30,7 @@ repos:
additional_dependencies: ['@commitlint/config-conventional@8.3.4'] additional_dependencies: ['@commitlint/config-conventional@8.3.4']
always_run: true always_run: true
- repo: https://github.com/rubocop-hq/rubocop - repo: https://github.com/rubocop-hq/rubocop
rev: v1.25.1 rev: v1.30.1
hooks: hooks:
- id: rubocop - id: rubocop
name: Check Ruby files with rubocop name: Check Ruby files with rubocop

13
.travis.yml
View File

@@ -97,6 +97,7 @@ jobs:
# - env: INSTANCE=default-debian-11-tiamat-py3 # - env: INSTANCE=default-debian-11-tiamat-py3
# - env: INSTANCE=default-debian-10-tiamat-py3 # - env: INSTANCE=default-debian-10-tiamat-py3
# - env: INSTANCE=default-debian-9-tiamat-py3 # - env: INSTANCE=default-debian-9-tiamat-py3
# - env: INSTANCE=default-ubuntu-2204-tiamat-py3
# - env: INSTANCE=default-ubuntu-2004-tiamat-py3 # - env: INSTANCE=default-ubuntu-2004-tiamat-py3
# - env: INSTANCE=default-ubuntu-1804-tiamat-py3 # - env: INSTANCE=default-ubuntu-1804-tiamat-py3
# - env: INSTANCE=default-centos-stream8-tiamat-py3 # - env: INSTANCE=default-centos-stream8-tiamat-py3
@@ -109,13 +110,13 @@ jobs:
- env: INSTANCE=default-debian-11-master-py3 - env: INSTANCE=default-debian-11-master-py3
- env: INSTANCE=default-debian-10-master-py3 - env: INSTANCE=default-debian-10-master-py3
- env: INSTANCE=default-debian-9-master-py3 - env: INSTANCE=default-debian-9-master-py3
- env: INSTANCE=default-ubuntu-2204-master-py3
- env: INSTANCE=default-ubuntu-2004-master-py3 - env: INSTANCE=default-ubuntu-2004-master-py3
- env: INSTANCE=default-ubuntu-1804-master-py3 - env: INSTANCE=default-ubuntu-1804-master-py3
- env: INSTANCE=default-centos-stream8-master-py3 - env: INSTANCE=default-centos-stream8-master-py3
- env: INSTANCE=default-centos-7-master-py3 - env: INSTANCE=default-centos-7-master-py3
- env: INSTANCE=default-fedora-36-master-py3 - env: INSTANCE=default-fedora-36-master-py3
- env: INSTANCE=default-fedora-35-master-py3 - env: INSTANCE=default-fedora-35-master-py3
- env: INSTANCE=default-fedora-34-master-py3
- env: INSTANCE=default-opensuse-leap-153-master-py3 - env: INSTANCE=default-opensuse-leap-153-master-py3
- env: INSTANCE=default-opensuse-tmbl-latest-master-py3 - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
- env: INSTANCE=default-amazonlinux-2-master-py3 - env: INSTANCE=default-amazonlinux-2-master-py3
@@ -129,13 +130,13 @@ jobs:
# - env: INSTANCE=default-debian-11-3004-1-py3 # - env: INSTANCE=default-debian-11-3004-1-py3
# - env: INSTANCE=default-debian-10-3004-1-py3 # - env: INSTANCE=default-debian-10-3004-1-py3
# - env: INSTANCE=default-debian-9-3004-1-py3 # - env: INSTANCE=default-debian-9-3004-1-py3
# - env: INSTANCE=default-ubuntu-2204-3004-1-py3
# - env: INSTANCE=default-ubuntu-2004-3004-1-py3 # - env: INSTANCE=default-ubuntu-2004-3004-1-py3
# - env: INSTANCE=default-ubuntu-1804-3004-1-py3 # - env: INSTANCE=default-ubuntu-1804-3004-1-py3
# - env: INSTANCE=default-centos-stream8-3004-1-py3 # - env: INSTANCE=default-centos-stream8-3004-1-py3
# - env: INSTANCE=default-centos-7-3004-1-py3 # - env: INSTANCE=default-centos-7-3004-1-py3
# - env: INSTANCE=default-fedora-36-3004-1-py3 # - env: INSTANCE=default-fedora-36-3004-1-py3
# - env: INSTANCE=default-fedora-35-3004-1-py3 # - env: INSTANCE=default-fedora-35-3004-1-py3
# - env: INSTANCE=default-fedora-34-3004-1-py3
# - env: INSTANCE=default-amazonlinux-2-3004-1-py3 # - env: INSTANCE=default-amazonlinux-2-3004-1-py3
# - env: INSTANCE=default-oraclelinux-8-3004-1-py3 # - env: INSTANCE=default-oraclelinux-8-3004-1-py3
# - env: INSTANCE=default-oraclelinux-7-3004-1-py3 # - env: INSTANCE=default-oraclelinux-7-3004-1-py3
@@ -156,14 +157,6 @@ jobs:
# - env: INSTANCE=default-oraclelinux-8-3003-4-py3 # - env: INSTANCE=default-oraclelinux-8-3003-4-py3
# - env: INSTANCE=default-oraclelinux-7-3003-4-py3 # - env: INSTANCE=default-oraclelinux-7-3003-4-py3
# - env: INSTANCE=default-almalinux-8-3003-4-py3 # - env: INSTANCE=default-almalinux-8-3003-4-py3
# - env: INSTANCE=default-debian-10-3002-8-py3
# - env: INSTANCE=default-debian-9-3002-8-py3
# - env: INSTANCE=default-ubuntu-2004-3002-8-py3
# - env: INSTANCE=default-ubuntu-1804-3002-8-py3
# - env: INSTANCE=default-centos-7-3002-8-py3
# - env: INSTANCE=default-amazonlinux-2-3002-8-py3
# - env: INSTANCE=default-oraclelinux-8-3002-8-py3
# - env: INSTANCE=default-oraclelinux-7-3002-8-py3
## Define the release stage that runs `semantic-release` ## Define the release stage that runs `semantic-release`
- stage: 'release' - stage: 'release'

2
Gemfile
View File

@@ -1,6 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
source ENV['PROXY_RUBYGEMSORG'] || 'https://rubygems.org' source ENV.fetch('PROXY_RUBYGEMSORG', 'https://rubygems.org')
# Install the `inspec` gem using `git` because versions after `4.22.22` # Install the `inspec` gem using `git` because versions after `4.22.22`
# suppress diff output; this version fixes this for our uses. # suppress diff output; this version fixes this for our uses.

128
Gemfile.lock
View File

@@ -1,20 +1,20 @@
GIT GIT
remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
revision: 1821d2dfd3365e8f05b8439845c58fa4d069806b revision: aaef842906a5666f0fc0b4f186b4dd3498f5b28c
branch: ssf branch: ssf
specs: specs:
inspec (5.12.2) inspec (5.18.15)
cookstyle cookstyle
faraday_middleware (>= 0.12.2, < 1.1) faraday_middleware (>= 0.12.2, < 1.1)
inspec-core (= 5.12.2) inspec-core (= 5.18.15)
mongo (= 2.13.2) mongo (= 2.13.2)
progress_bar (~> 1.3.3) progress_bar (~> 1.3.3)
rake rake
train (~> 3.0) train (~> 3.10)
train-aws (~> 0.2) train-aws (~> 0.2)
train-habitat (~> 0.1) train-habitat (~> 0.1)
train-winrm (~> 0.2) train-winrm (~> 0.2)
inspec-core (5.12.2) inspec-core (5.18.15)
addressable (~> 2.4) addressable (~> 2.4)
chef-telemetry (~> 1.0, >= 1.0.8) chef-telemetry (~> 1.0, >= 1.0.8)
faraday (>= 0.9.0, < 1.5) faraday (>= 0.9.0, < 1.5)
@@ -34,7 +34,7 @@ GIT
sslshake (~> 1.2) sslshake (~> 1.2)
thor (>= 0.20, < 2.0) thor (>= 0.20, < 2.0)
tomlrb (>= 1.2, < 2.1) tomlrb (>= 1.2, < 2.1)
train-core (~> 3.0) train-core (~> 3.10)
tty-prompt (~> 0.17) tty-prompt (~> 0.17)
tty-table (~> 0.10) tty-table (~> 0.10)
@@ -49,7 +49,7 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
activesupport (7.0.2.3) activesupport (7.0.3.1)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
@@ -58,14 +58,14 @@ GEM
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 5.0)
ast (2.4.2) ast (2.4.2)
aws-eventstream (1.2.0) aws-eventstream (1.2.0)
aws-partitions (1.577.0) aws-partitions (1.607.0)
aws-sdk-alexaforbusiness (1.56.0) aws-sdk-alexaforbusiness (1.56.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-amplify (1.32.0) aws-sdk-amplify (1.32.0)
aws-sdk-core (~> 3, >= 3.120.0) aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-apigateway (1.76.0) aws-sdk-apigateway (1.78.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-apigatewayv2 (1.42.0) aws-sdk-apigatewayv2 (1.42.0)
@@ -74,7 +74,7 @@ GEM
aws-sdk-applicationautoscaling (1.51.0) aws-sdk-applicationautoscaling (1.51.0)
aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-athena (1.53.0) aws-sdk-athena (1.55.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-autoscaling (1.63.0) aws-sdk-autoscaling (1.63.0)
@@ -83,13 +83,13 @@ GEM
aws-sdk-batch (1.47.0) aws-sdk-batch (1.47.0)
aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-budgets (1.49.0) aws-sdk-budgets (1.50.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-cloudformation (1.68.0) aws-sdk-cloudformation (1.70.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-cloudfront (1.63.0) aws-sdk-cloudfront (1.65.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-cloudhsm (1.39.0) aws-sdk-cloudhsm (1.39.0)
@@ -98,7 +98,7 @@ GEM
aws-sdk-cloudhsmv2 (1.42.0) aws-sdk-cloudhsmv2 (1.42.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-cloudtrail (1.48.0) aws-sdk-cloudtrail (1.49.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-cloudwatch (1.64.0) aws-sdk-cloudwatch (1.64.0)
@@ -107,7 +107,7 @@ GEM
aws-sdk-cloudwatchevents (1.46.0) aws-sdk-cloudwatchevents (1.46.0)
aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-cloudwatchlogs (1.52.0) aws-sdk-cloudwatchlogs (1.53.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-codecommit (1.51.0) aws-sdk-codecommit (1.51.0)
@@ -125,24 +125,24 @@ GEM
aws-sdk-cognitoidentityprovider (1.53.0) aws-sdk-cognitoidentityprovider (1.53.0)
aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-configservice (1.77.0) aws-sdk-configservice (1.79.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-core (3.130.1) aws-sdk-core (3.131.2)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0) aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
jmespath (~> 1.0) jmespath (~> 1, >= 1.6.1)
aws-sdk-costandusagereportservice (1.40.0) aws-sdk-costandusagereportservice (1.40.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-databasemigrationservice (1.53.0) aws-sdk-databasemigrationservice (1.53.0)
aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-dynamodb (1.74.0) aws-sdk-dynamodb (1.75.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-ec2 (1.307.0) aws-sdk-ec2 (1.322.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-ecr (1.56.0) aws-sdk-ecr (1.56.0)
@@ -151,16 +151,16 @@ GEM
aws-sdk-ecrpublic (1.12.0) aws-sdk-ecrpublic (1.12.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-ecs (1.99.0) aws-sdk-ecs (1.100.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-efs (1.54.0) aws-sdk-efs (1.54.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-eks (1.74.0) aws-sdk-eks (1.75.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-elasticache (1.76.0) aws-sdk-elasticache (1.78.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-elasticbeanstalk (1.51.0) aws-sdk-elasticbeanstalk (1.51.0)
@@ -169,7 +169,7 @@ GEM
aws-sdk-elasticloadbalancing (1.40.0) aws-sdk-elasticloadbalancing (1.40.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-elasticloadbalancingv2 (1.77.0) aws-sdk-elasticloadbalancingv2 (1.78.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-elasticsearchservice (1.65.0) aws-sdk-elasticsearchservice (1.65.0)
@@ -187,31 +187,31 @@ GEM
aws-sdk-glue (1.88.0) aws-sdk-glue (1.88.0)
aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-guardduty (1.56.0) aws-sdk-guardduty (1.58.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-iam (1.68.0) aws-sdk-iam (1.69.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-kafka (1.49.0) aws-sdk-kafka (1.50.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-kinesis (1.41.0) aws-sdk-kinesis (1.41.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-kms (1.55.0) aws-sdk-kms (1.57.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-lambda (1.83.0) aws-sdk-lambda (1.84.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-mq (1.40.0) aws-sdk-mq (1.40.0)
aws-sdk-core (~> 3, >= 3.120.0) aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-networkfirewall (1.15.0) aws-sdk-networkfirewall (1.17.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-networkmanager (1.22.0) aws-sdk-networkmanager (1.24.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-organizations (1.59.0) aws-sdk-organizations (1.59.0)
@@ -220,13 +220,13 @@ GEM
aws-sdk-ram (1.26.0) aws-sdk-ram (1.26.0)
aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-rds (1.143.0) aws-sdk-rds (1.148.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-redshift (1.80.0) aws-sdk-redshift (1.84.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-route53 (1.62.0) aws-sdk-route53 (1.63.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-route53domains (1.40.0) aws-sdk-route53domains (1.40.0)
@@ -235,7 +235,7 @@ GEM
aws-sdk-route53resolver (1.37.0) aws-sdk-route53resolver (1.37.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.113.0) aws-sdk-s3 (1.114.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-kms (~> 1) aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4) aws-sigv4 (~> 1.4)
@@ -245,7 +245,7 @@ GEM
aws-sdk-secretsmanager (1.46.0) aws-sdk-secretsmanager (1.46.0)
aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-securityhub (1.63.0) aws-sdk-securityhub (1.67.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-servicecatalog (1.60.0) aws-sdk-servicecatalog (1.60.0)
@@ -269,10 +269,10 @@ GEM
aws-sdk-sns (1.53.0) aws-sdk-sns (1.53.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-sqs (1.51.0) aws-sdk-sqs (1.51.1)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-ssm (1.134.0) aws-sdk-ssm (1.137.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-states (1.39.0) aws-sdk-states (1.39.0)
@@ -288,7 +288,7 @@ GEM
aws-sdk-core (~> 3, >= 3.122.0) aws-sdk-core (~> 3, >= 3.122.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sigv2 (1.1.0) aws-sigv2 (1.1.0)
aws-sigv4 (1.4.0) aws-sigv4 (1.5.0)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
azure_graph_rbac (0.17.2) azure_graph_rbac (0.17.2)
ms_rest_azure (~> 0.12.0) ms_rest_azure (~> 0.12.0)
@@ -301,7 +301,7 @@ GEM
azure_mgmt_storage (0.23.0) azure_mgmt_storage (0.23.0)
ms_rest_azure (~> 0.12.0) ms_rest_azure (~> 0.12.0)
bcrypt_pbkdf (1.1.0) bcrypt_pbkdf (1.1.0)
bson (4.14.1) bson (4.15.0)
builder (3.2.4) builder (3.2.4)
chef-config (17.10.0) chef-config (17.10.0)
addressable addressable
@@ -328,7 +328,7 @@ GEM
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
ed25519 (1.3.0) ed25519 (1.3.0)
erubi (1.10.0) erubi (1.10.0)
excon (0.92.2) excon (0.92.3)
faraday (1.4.3) faraday (1.4.3)
faraday-em_http (~> 1.0) faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0) faraday-em_synchrony (~> 1.0)
@@ -372,18 +372,18 @@ GEM
rexml (~> 3.0) rexml (~> 3.0)
hashie (4.1.0) hashie (4.1.0)
highline (2.0.3) highline (2.0.3)
http-cookie (1.0.4) http-cookie (1.0.5)
domain_name (~> 0.5) domain_name (~> 0.5)
httpclient (2.8.3) httpclient (2.8.3)
i18n (1.10.0) i18n (1.12.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
inifile (3.0.0) inifile (3.0.0)
jmespath (1.6.1) jmespath (1.6.1)
json (2.6.1) json (2.6.2)
jwt (2.3.0) jwt (2.4.1)
kitchen-inspec (2.5.2) kitchen-inspec (2.6.1)
hashie (>= 3.4, <= 5.0) hashie (>= 3.4, <= 5.0)
inspec (>= 2.2.64, < 6.0) inspec (>= 2.2.64, < 7.0)
test-kitchen (>= 2.7, < 4) test-kitchen (>= 2.7, < 4)
kitchen-salt (0.7.2) kitchen-salt (0.7.2)
hashie (>= 3.5) hashie (>= 3.5)
@@ -394,16 +394,16 @@ GEM
tty-box (~> 0.6) tty-box (~> 0.6)
tty-prompt (~> 0.20) tty-prompt (~> 0.20)
little-plugger (1.1.4) little-plugger (1.1.4)
logging (2.3.0) logging (2.3.1)
little-plugger (~> 1.1) little-plugger (~> 1.1)
multi_json (~> 1.14) multi_json (~> 1.14)
memoist (0.16.2) memoist (0.16.2)
method_source (1.0.0) method_source (1.0.0)
mini_mime (1.1.2) mini_mime (1.1.2)
minitest (5.15.0) minitest (5.16.2)
mixlib-config (3.0.9) mixlib-config (3.0.27)
tomlrb tomlrb
mixlib-install (3.12.16) mixlib-install (3.12.19)
mixlib-shellout mixlib-shellout
mixlib-versioning mixlib-versioning
thor thor
@@ -423,7 +423,7 @@ GEM
faraday-cookie_jar (~> 0.0.6) faraday-cookie_jar (~> 0.0.6)
ms_rest (~> 0.7.6) ms_rest (~> 0.7.6)
multi_json (1.15.0) multi_json (1.15.0)
multipart-post (2.1.1) multipart-post (2.2.3)
net-scp (3.0.0) net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0) net-ssh (>= 2.6.5, < 7.0.0)
net-ssh (6.1.0) net-ssh (6.1.0)
@@ -447,8 +447,8 @@ GEM
public_suffix (4.0.7) public_suffix (4.0.7)
rainbow (3.1.1) rainbow (3.1.1)
rake (13.0.6) rake (13.0.6)
regexp_parser (2.3.0) regexp_parser (2.5.0)
representable (3.1.1) representable (3.2.0)
declarative (< 0.1.0) declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0) trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0) uber (< 0.2.0)
@@ -479,16 +479,16 @@ GEM
rubocop-ast (>= 1.15.1, < 2.0) rubocop-ast (>= 1.15.1, < 2.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0) unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.17.0) rubocop-ast (1.19.1)
parser (>= 3.1.1.0) parser (>= 3.1.1.0)
ruby-progressbar (1.11.0) ruby-progressbar (1.11.0)
ruby2_keywords (0.0.5) ruby2_keywords (0.0.5)
rubyntlm (0.6.3) rubyntlm (0.6.3)
rubyzip (2.3.2) rubyzip (2.3.2)
semverse (3.0.0) semverse (3.0.2)
signet (0.16.1) signet (0.17.0)
addressable (~> 2.8) addressable (~> 2.8)
faraday (>= 0.17.5, < 3.0) faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0) jwt (>= 1.5, < 3.0)
multi_json (~> 1.10) multi_json (~> 1.10)
sslshake (1.3.1) sslshake (1.3.1)
@@ -497,7 +497,7 @@ GEM
unicode-display_width (>= 1.5, < 3.0) unicode-display_width (>= 1.5, < 3.0)
unicode_utils (~> 1.4) unicode_utils (~> 1.4)
strings-ansi (0.2.0) strings-ansi (0.2.0)
test-kitchen (3.2.2) test-kitchen (3.3.1)
bcrypt_pbkdf (~> 1.0) bcrypt_pbkdf (~> 1.0)
chef-utils (>= 16.4.35) chef-utils (>= 16.4.35)
ed25519 (~> 1.2) ed25519 (~> 1.2)
@@ -515,7 +515,7 @@ GEM
timeliness (0.3.10) timeliness (0.3.10)
tomlrb (1.3.0) tomlrb (1.3.0)
trailblazer-option (0.1.2) trailblazer-option (0.1.2)
train (3.9.2) train (3.10.1)
activesupport (>= 6.0.3.1) activesupport (>= 6.0.3.1)
azure_graph_rbac (~> 0.16) azure_graph_rbac (~> 0.16)
azure_mgmt_key_vault (~> 0.17) azure_mgmt_key_vault (~> 0.17)
@@ -526,7 +526,7 @@ GEM
google-api-client (>= 0.23.9, <= 0.52.0) google-api-client (>= 0.23.9, <= 0.52.0)
googleauth (>= 0.6.6, <= 0.14.0) googleauth (>= 0.6.6, <= 0.14.0)
inifile (~> 3.0) inifile (~> 3.0)
train-core (= 3.9.2) train-core (= 3.10.1)
train-winrm (~> 0.2) train-winrm (~> 0.2)
train-aws (0.2.24) train-aws (0.2.24)
aws-sdk-alexaforbusiness (~> 1.0) aws-sdk-alexaforbusiness (~> 1.0)
@@ -604,7 +604,7 @@ GEM
aws-sdk-synthetics (~> 1.19.0) aws-sdk-synthetics (~> 1.19.0)
aws-sdk-transfer (>= 1.26, < 1.35) aws-sdk-transfer (>= 1.26, < 1.35)
aws-sdk-waf (~> 1.43.0) aws-sdk-waf (~> 1.43.0)
train-core (3.9.2) train-core (3.10.1)
addressable (~> 2.5) addressable (~> 2.5)
ffi (!= 1.13.0) ffi (!= 1.13.0)
json (>= 1.8, < 3.0) json (>= 1.8, < 3.0)
@@ -639,8 +639,8 @@ GEM
uber (0.1.0) uber (0.1.0)
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
unf_ext (0.0.8.1) unf_ext (0.0.8.2)
unicode-display_width (2.1.0) unicode-display_width (2.2.0)
unicode_utils (1.4.0) unicode_utils (1.4.0)
winrm (2.3.6) winrm (2.3.6)
builder (>= 2.1.2) builder (>= 2.1.2)

48
kitchen.yml
View File

@@ -34,6 +34,10 @@ platforms:
driver: driver:
image: saltimages/salt-tiamat-py3:debian-9 image: saltimages/salt-tiamat-py3:debian-9
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: ubuntu-2204-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:ubuntu-22.04
run_command: /lib/systemd/systemd
- name: ubuntu-2004-tiamat-py3 - name: ubuntu-2004-tiamat-py3
driver: driver:
image: saltimages/salt-tiamat-py3:ubuntu-20.04 image: saltimages/salt-tiamat-py3:ubuntu-20.04
@@ -77,6 +81,10 @@ platforms:
driver: driver:
image: saltimages/salt-master-py3:debian-9 image: saltimages/salt-master-py3:debian-9
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: ubuntu-2204-master-py3
driver:
image: saltimages/salt-master-py3:ubuntu-22.04
run_command: /lib/systemd/systemd
- name: ubuntu-2004-master-py3 - name: ubuntu-2004-master-py3
driver: driver:
image: saltimages/salt-master-py3:ubuntu-20.04 image: saltimages/salt-master-py3:ubuntu-20.04
@@ -97,9 +105,6 @@ platforms:
- name: fedora-35-master-py3 - name: fedora-35-master-py3
driver: driver:
image: saltimages/salt-master-py3:fedora-35 image: saltimages/salt-master-py3:fedora-35
- name: fedora-34-master-py3
driver:
image: saltimages/salt-master-py3:fedora-34
- name: opensuse-leap-153-master-py3 - name: opensuse-leap-153-master-py3
driver: driver:
image: saltimages/salt-master-py3:opensuse-leap-15.3 image: saltimages/salt-master-py3:opensuse-leap-15.3
@@ -153,6 +158,10 @@ platforms:
driver: driver:
image: saltimages/salt-3004.1-py3:debian-9 image: saltimages/salt-3004.1-py3:debian-9
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: ubuntu-2204-3004-1-py3
driver:
image: saltimages/salt-3004.1-py3:ubuntu-22.04
run_command: /lib/systemd/systemd
- name: ubuntu-2004-3004-1-py3 - name: ubuntu-2004-3004-1-py3
driver: driver:
image: saltimages/salt-3004.1-py3:ubuntu-20.04 image: saltimages/salt-3004.1-py3:ubuntu-20.04
@@ -173,9 +182,6 @@ platforms:
- name: fedora-35-3004-1-py3 - name: fedora-35-3004-1-py3
driver: driver:
image: saltimages/salt-3004.1-py3:fedora-35 image: saltimages/salt-3004.1-py3:fedora-35
- name: fedora-34-3004-1-py3
driver:
image: saltimages/salt-3004.1-py3:fedora-34
- name: amazonlinux-2-3004-1-py3 - name: amazonlinux-2-3004-1-py3
driver: driver:
image: saltimages/salt-3004.1-py3:amazonlinux-2 image: saltimages/salt-3004.1-py3:amazonlinux-2
@@ -254,36 +260,6 @@ platforms:
driver: driver:
image: saltimages/salt-3003.4-py3:almalinux-8 image: saltimages/salt-3003.4-py3:almalinux-8
## SALT `3002.8`
- name: debian-10-3002-8-py3
driver:
image: saltimages/salt-3002.8-py3:debian-10
run_command: /lib/systemd/systemd
- name: debian-9-3002-8-py3
driver:
image: saltimages/salt-3002.8-py3:debian-9
run_command: /lib/systemd/systemd
- name: ubuntu-2004-3002-8-py3
driver:
image: saltimages/salt-3002.8-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
- name: ubuntu-1804-3002-8-py3
driver:
image: saltimages/salt-3002.8-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
- name: centos-7-3002-8-py3
driver:
image: saltimages/salt-3002.8-py3:centos-7
- name: amazonlinux-2-3002-8-py3
driver:
image: saltimages/salt-3002.8-py3:amazonlinux-2
- name: oraclelinux-8-3002-8-py3
driver:
image: saltimages/salt-3002.8-py3:oraclelinux-8
- name: oraclelinux-7-3002-8-py3
driver:
image: saltimages/salt-3002.8-py3:oraclelinux-7
verifier: verifier:
# https://www.inspec.io/ # https://www.inspec.io/
name: inspec name: inspec

103
test/integration/default/files/_mapdata/ubuntu-22.yaml Normal file
View File

@@ -0,0 +1,103 @@
# yamllint disable rule:indentation rule:line-length
# Ubuntu-22.04
---
values:
added_in_defaults: defaults_value
added_in_lookup: lookup_value
added_in_pillar: pillar_value
lookup:
arch: amd64
rootgroup: root
config: '/etc/gitea/app.ini'
service:
name: gitea
build_user: giteabuild
build_user_home: /home/giteabuild
go:
pkg: https://go.dev/dl/go1.18.2.linux-amd64.tar.gz
source_hash: e54bec97a1a5d230fc2f9ad0880fcbabb5888f30ed9666eca4a91c5a32e86cbc
gpg:
key: 7C9E68152594688862D62AF62D9AE806EC1592E2
keyserver: keys.openpgp.org
group: git
mod_rst:
chroma_bin: /opt/chroma/chroma
chroma_build_path: /opt/chroma/src
chroma_repo: https://github.com/alecthomas/chroma
chroma_rev: HEAD
path: /usr/local/bin/grst
pip_dependencies:
- docutils
pkg_dependencies:
- python3
- python3-pip
paths:
bin: /opt/gitea
conf: /etc/gitea
custom: /var/lib/gitea/custom
data: /var/lib/gitea/data
internal_token_uri: file:///etc/gitea/internal_token
log: /var/log/gitea
repos: /var/lib/gitea/data/gitea-repositories
work: /var/lib/gitea
pkg:
latest: https://dl.gitea.io/gitea/version.json
sig: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.asc
source: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}
source_hash: https://dl.gitea.io/gitea/{version}/gitea-{version}-linux-{arch}.sha256
requirements:
- git
- gpg
- python-gnupg
shell: /bin/bash
user: git
config:
database:
db_type: sqlite3
default:
app_name: Gitea
run_mode: prod
run_user: git
log:
level: Info
mode: console
stacktrace_level: None
oauth2:
jwt_secret: ''
repository.signing:
signing_key: default
security:
internal_token: ''
secret_key: ''
server:
domain: localhost
http_addr: 0.0.0.0
http_port: 3000
lfs_jwt_secret: ''
protocol: http
service:
requires_mount: []
socket_activation: false
wants: []
version: latest
map_jinja:
sources:
- Y:G@osarch
- Y:G@os_family
- Y:G@os
- Y:G@osfinger
- C@gitea
- Y:G@id
master: template-master
tofs:
files_switch:
- any/path/can/be/used/here
- id
- roles
- osfinger
- os
- os_family
source_files:
gitea-config-file-file-managed:
- example.tmpl.jinja
winner: pillar

1
test/integration/default/inspec.yml
View File

@@ -25,4 +25,5 @@ supports:
- platform-name: gentoo - platform-name: gentoo
- platform-name: almalinux - platform-name: almalinux
- platform-name: rocky - platform-name: rocky
- platform-name: mac_os_x
- platform: windows - platform: windows

1
test/integration/share/inspec.yml
View File

@@ -21,4 +21,5 @@ supports:
- platform-name: gentoo - platform-name: gentoo
- platform-name: almalinux - platform-name: almalinux
- platform-name: rocky - platform-name: rocky
- platform-name: mac_os_x
- platform: windows - platform: windows

4
test/integration/share/libraries/system.rb
View File

@@ -57,6 +57,8 @@ class SystemResource < Inspec.resource(1)
'base-latest' 'base-latest'
when 'gentoo' when 'gentoo'
"#{inspec.platform[:release].split('.')[0]}-#{derive_gentoo_init_system}" "#{inspec.platform[:release].split('.')[0]}-#{derive_gentoo_init_system}"
when 'mac_os_x'
inspec.command('sw_vers -productVersion').stdout.to_s
when 'opensuse' when 'opensuse'
# rubocop:disable Style/NumericLiterals,Layout/LineLength # rubocop:disable Style/NumericLiterals,Layout/LineLength
inspec.platform[:release].to_i > 20210101 ? 'tumbleweed' : inspec.platform[:release] inspec.platform[:release].to_i > 20210101 ? 'tumbleweed' : inspec.platform[:release]
@@ -95,6 +97,8 @@ class SystemResource < Inspec.resource(1)
# rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity
def build_platform_codename def build_platform_codename
case build_platform_finger case build_platform_finger
when 'ubuntu-22.04'
'jammy'
when 'ubuntu-20.04' when 'ubuntu-20.04'
'focal' 'focal'
when 'ubuntu-18.04' when 'ubuntu-18.04'