diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 34487a7b6..2c3a6e26d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -130,6 +130,7 @@ rubocop: ## Define the rest of the matrix based on Kitchen testing # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` +# yamllint disable rule:line-length # default-debian-11-tiamat-py3: {extends: '.test_instance'} # default-debian-10-tiamat-py3: {extends: '.test_instance'} # default-debian-9-tiamat-py3: {extends: '.test_instance'} @@ -149,6 +150,7 @@ rubocop: # default-ubuntu-1804-master-py3: {extends: '.test_instance'} # default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'} # default-centos-7-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-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'} @@ -160,54 +162,44 @@ rubocop: # default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-almalinux-8-master-py3: {extends: '.test_instance'} # default-rockylinux-8-master-py3: {extends: '.test_instance'} -default-debian-11-3004-0-py3: {extends: '.test_instance'} -# default-debian-10-3004-0-py3: {extends: '.test_instance'} -# default-debian-9-3004-0-py3: {extends: '.test_instance'} -default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'} -default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'} -# default-centos-7-3004-0-py3: {extends: '.test_instance'} -# default-fedora-34-3004-0-py3: {extends: '.test_instance'} +default-debian-11-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-ubuntu-2004-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-7-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-oraclelinux-8-3004-1-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'} +default-arch-base-latest-3004-1-py3: {extends: '.test_instance'} +default-gentoo-stage3-latest-3004-1-py3: {extends: '.test_instance'} +default-gentoo-stage3-systemd-3004-1-py3: {extends: '.test_instance'} +default-almalinux-8-3004-1-py3: {extends: '.test_instance'} +default-rockylinux-8-3004-1-py3: {extends: '.test_instance'} default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'} default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'} -default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'} -default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3004-0-py3: {extends: '.test_instance'} -default-arch-base-latest-3004-0-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3004-0-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'} -default-almalinux-8-3004-0-py3: {extends: '.test_instance'} -default-rockylinux-8-3004-0-py3: {extends: '.test_instance'} -default-debian-10-3003-3-py3: {extends: '.test_instance'} -# default-debian-9-3003-3-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'} -default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'} -# default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'} -default-centos-7-3003-3-py3: {extends: '.test_instance'} -default-fedora-35-3003-3-py3: {extends: '.test_instance_failure_permitted'} -default-fedora-34-3003-3-py3: {extends: '.test_instance'} -# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'} -# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'} -default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'} -default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'} -default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'} -# default-almalinux-8-3003-3-py3: {extends: '.test_instance'} -# default-debian-10-3002-7-py3: {extends: '.test_instance'} -default-debian-9-3002-7-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'} -# default-centos-7-3002-7-py3: {extends: '.test_instance'} -# default-fedora-35-3002-7-py3: {extends: '.test_instance_failure_permitted'} -# default-fedora-34-3002-7-py3: {extends: '.test_instance'} -# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'} -# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'} +default-debian-10-3003-4-py3: {extends: '.test_instance'} +# default-debian-9-3003-4-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'} +default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'} +# default-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'} +default-centos-7-3003-4-py3: {extends: '.test_instance'} +# default-amazonlinux-2-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-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 ############################################################################### # `release` stage: `semantic-release` diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 41b5f35da..2cb381ed8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: additional_dependencies: ['@commitlint/config-conventional@8.3.4'] always_run: true - repo: https://github.com/rubocop-hq/rubocop - rev: v1.9.1 + rev: v1.25.1 hooks: - id: rubocop name: Check Ruby files with rubocop @@ -26,14 +26,14 @@ repos: always_run: true pass_filenames: false - repo: https://github.com/shellcheck-py/shellcheck-py - rev: v0.7.1.1 + rev: v0.8.0.4 hooks: - id: shellcheck name: Check shell scripts with shellcheck files: ^.*\.(sh|bash|ksh)$ types: [] - repo: https://github.com/adrienverge/yamllint - rev: v1.23.0 + rev: v1.26.3 hooks: - id: yamllint name: Check YAML syntax with yamllint @@ -41,7 +41,7 @@ repos: always_run: true pass_filenames: false - repo: https://github.com/warpnet/salt-lint - rev: v0.3.0 + rev: v0.8.0 hooks: - id: salt-lint name: Check Salt files using salt-lint diff --git a/.rubocop.yml b/.rubocop.yml index 2cceb739b..bf4d107f9 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -16,4 +16,8 @@ Security/YAMLLoad: Exclude: - test/integration/**/_mapdata.rb +# General settings across all cops in this formula +AllCops: + NewCops: enable + # Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config` diff --git a/.travis.yml b/.travis.yml index 2110e2e7b..f34fafaa3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -102,6 +102,7 @@ jobs: # - env: INSTANCE=default-ubuntu-1804-master-py3 # - env: INSTANCE=default-centos-stream8-master-py3 # - env: INSTANCE=default-centos-7-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-tmbl-latest-master-py3 @@ -113,54 +114,43 @@ jobs: # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3 # - env: INSTANCE=default-almalinux-8-master-py3 # - env: INSTANCE=default-rockylinux-8-master-py3 - - env: INSTANCE=default-debian-11-3004-0-py3 - # - env: INSTANCE=default-debian-10-3004-0-py3 - # - env: INSTANCE=default-debian-9-3004-0-py3 - - env: INSTANCE=default-ubuntu-2004-3004-0-py3 - # - env: INSTANCE=default-ubuntu-1804-3004-0-py3 - - env: INSTANCE=default-centos-stream8-3004-0-py3 - # - env: INSTANCE=default-centos-7-3004-0-py3 - # - env: INSTANCE=default-fedora-34-3004-0-py3 + - env: INSTANCE=default-debian-11-3004-1-py3 + # - env: INSTANCE=default-debian-10-3004-1-py3 + # - env: INSTANCE=default-debian-9-3004-1-py3 + - env: INSTANCE=default-ubuntu-2004-3004-1-py3 + # - env: INSTANCE=default-ubuntu-1804-3004-1-py3 + - env: INSTANCE=default-centos-stream8-3004-1-py3 + # - env: INSTANCE=default-centos-7-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-oraclelinux-8-3004-1-py3 + # - env: INSTANCE=default-oraclelinux-7-3004-1-py3 + - env: INSTANCE=default-arch-base-latest-3004-1-py3 + - env: INSTANCE=default-gentoo-stage3-latest-3004-1-py3 + - env: INSTANCE=default-gentoo-stage3-systemd-3004-1-py3 + - env: INSTANCE=default-almalinux-8-3004-1-py3 + - env: INSTANCE=default-rockylinux-8-3004-1-py3 - env: INSTANCE=default-opensuse-leap-153-3004-0-py3 - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3 - - env: INSTANCE=default-amazonlinux-2-3004-0-py3 - - env: INSTANCE=default-oraclelinux-8-3004-0-py3 - # - env: INSTANCE=default-oraclelinux-7-3004-0-py3 - - env: INSTANCE=default-arch-base-latest-3004-0-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3004-0-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3 - - env: INSTANCE=default-almalinux-8-3004-0-py3 - - env: INSTANCE=default-rockylinux-8-3004-0-py3 - - env: INSTANCE=default-debian-10-3003-3-py3 - # - env: INSTANCE=default-debian-9-3003-3-py3 - # - env: INSTANCE=default-ubuntu-2004-3003-3-py3 - - env: INSTANCE=default-ubuntu-1804-3003-3-py3 - # - env: INSTANCE=default-centos-stream8-3003-3-py3 - - env: INSTANCE=default-centos-7-3003-3-py3 - - env: INSTANCE=default-fedora-35-3003-3-py3 - - env: INSTANCE=default-fedora-34-3003-3-py3 - # - env: INSTANCE=default-opensuse-leap-153-3003-3-py3 - # - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3 - # - env: INSTANCE=default-amazonlinux-2-3003-3-py3 - # - env: INSTANCE=default-oraclelinux-8-3003-3-py3 - - env: INSTANCE=default-oraclelinux-7-3003-3-py3 - - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3 - - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3 - # - env: INSTANCE=default-almalinux-8-3003-3-py3 - # - env: INSTANCE=default-debian-10-3002-7-py3 - - env: INSTANCE=default-debian-9-3002-7-py3 - # - env: INSTANCE=default-ubuntu-2004-3002-7-py3 - # - env: INSTANCE=default-ubuntu-1804-3002-7-py3 - # - env: INSTANCE=default-centos-7-3002-7-py3 - # - env: INSTANCE=default-fedora-35-3002-7-py3 - # - env: INSTANCE=default-fedora-34-3002-7-py3 - # - env: INSTANCE=default-opensuse-leap-153-3002-7-py3 - # - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3 - # - env: INSTANCE=default-amazonlinux-2-3002-7-py3 - # - env: INSTANCE=default-oraclelinux-8-3002-7-py3 - # - env: INSTANCE=default-oraclelinux-7-3002-7-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3 + - env: INSTANCE=default-debian-10-3003-4-py3 + # - env: INSTANCE=default-debian-9-3003-4-py3 + # - env: INSTANCE=default-ubuntu-2004-3003-4-py3 + - env: INSTANCE=default-ubuntu-1804-3003-4-py3 + # - env: INSTANCE=default-centos-stream8-3003-4-py3 + - env: INSTANCE=default-centos-7-3003-4-py3 + # - env: INSTANCE=default-amazonlinux-2-3003-4-py3 + # - env: INSTANCE=default-oraclelinux-8-3003-4-py3 + - env: INSTANCE=default-oraclelinux-7-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` - stage: 'release' diff --git a/AUTHORS.md b/AUTHORS.md index 2b607dcc3..10da97ca3 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,7 +4,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|261 +@myii|[@myii](https://github.com/myii)|274 @aboe76|[@aboe76](https://github.com/aboe76)|101 @gravyboat|[@gravyboat](https://github.com/gravyboat)|71 @nmadhok|[@nmadhok](https://github.com/nmadhok)|54 @@ -68,7 +68,7 @@ Avatar|Contributor|Contributions @aanriot|[@aanriot](https://github.com/aanriot)|1 @alejdg|[@alejdg](https://github.com/alejdg)|1 @ernstae|[@ernstae](https://github.com/ernstae)|1 -@arthurlogilab|[@arthurlogilab](https://github.com/arthurlogilab)|1 +@arthurzenika|[@arthurzenika](https://github.com/arthurzenika)|1 @kakwa|[@kakwa](https://github.com/kakwa)|1 @dth202|[@dth202](https://github.com/dth202)|1 @baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|1 @@ -114,4 +114,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-02-03. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-04-03. diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d4fc5ec0..8280b2e41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [1.10.2](https://github.com/saltstack-formulas/salt-formula/compare/v1.10.1...v1.10.2) (2022-04-03) + + +### Bug Fixes + +* **gentoo:** use `retry_options` to avoid spurious service failures ([d00c069](https://github.com/saltstack-formulas/salt-formula/commit/d00c069e25463e6e675b0cea9f625a6e78985744)) + + +### Continuous Integration + +* **kitchen+gitlab:** update for new pre-salted images [skip ci] ([92a82a9](https://github.com/saltstack-formulas/salt-formula/commit/92a82a98c72e5297caf08e1e135b72d09c2e4149)) +* update linters to latest versions [skip ci] ([47efbc0](https://github.com/saltstack-formulas/salt-formula/commit/47efbc04920a3f20ef9a69350b1ee46bbee11b37)) + + +### Tests + +* **_mapdata:** add/update verification files for Fedora & Gentoo ([e9cb3d2](https://github.com/saltstack-formulas/salt-formula/commit/e9cb3d27284d81115bac16c3af225c4b25eebaf9)) +* **system:** add `build_platform_codename` [skip ci] ([6b5598a](https://github.com/saltstack-formulas/salt-formula/commit/6b5598a8d8d91ccc367283f80d5c736c7eb0168c)) + ## [1.10.1](https://github.com/saltstack-formulas/salt-formula/compare/v1.10.0...v1.10.1) (2022-02-03) diff --git a/FORMULA b/FORMULA index d6c10c135..72ffc1026 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: salt os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Oracle, Amazon, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, FreeBSD, OpenBSD, Windows os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows -version: 1.10.1 +version: 1.10.2 release: 1 minimum_version: 2015.8 summary: Formula for install Saltstack diff --git a/Gemfile.lock b/Gemfile.lock index 7e910a56c..d85bdc6ee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,20 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: f70a1105c67988e97c1a90f3f612e48d2fe2fec9 + revision: 36118e817641fbc1d4bd9753a77c383e7b20caff branch: ssf specs: - inspec (4.55.6) + inspec (5.10.7) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.55.6) + inspec-core (= 5.10.7) mongo (= 2.13.2) + progress_bar (~> 1.3.3) rake train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.55.6) + inspec-core (5.10.7) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -26,7 +27,7 @@ GIT parallel (~> 1.9) parslet (>= 1.5, < 2.0) pry (~> 0.13) - rspec (>= 3.9, < 3.11) + rspec (>= 3.9, <= 3.11) rspec-its (~> 1.2) rubyzip (>= 1.2.2, < 3.0) semverse (~> 3.0) @@ -48,7 +49,7 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (7.0.1) + activesupport (7.0.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -57,24 +58,24 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.551.0) - aws-sdk-alexaforbusiness (1.54.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-partitions (1.571.0) + aws-sdk-alexaforbusiness (1.56.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-amplify (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-apigateway (1.73.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-apigateway (1.75.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.40.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-apigatewayv2 (1.42.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.46.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-athena (1.52.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.63.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -82,41 +83,41 @@ GEM aws-sdk-batch (1.47.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.45.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-budgets (1.49.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.64.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-cloudformation (1.68.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.61.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-cloudfront (1.63.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.37.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-cloudhsm (1.39.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.40.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-cloudhsmv2 (1.42.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.45.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-cloudtrail (1.48.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.60.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-cloudwatch (1.62.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudwatchevents (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.50.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-cloudwatchlogs (1.52.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.49.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-codecommit (1.51.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.47.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-codedeploy (1.49.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.51.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-codepipeline (1.53.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cognitoidentity (1.31.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -124,55 +125,55 @@ GEM aws-sdk-cognitoidentityprovider (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.72.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-configservice (1.76.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.125.5) + aws-sdk-core (3.130.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.38.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-costandusagereportservice (1.40.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-databasemigrationservice (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.70.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-dynamodb (1.74.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.296.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-ec2 (1.304.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.52.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-ecr (1.56.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ecrpublic (1.10.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-ecrpublic (1.12.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.94.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-ecs (1.99.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.51.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-efs (1.53.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.71.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-eks (1.74.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.70.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-elasticache (1.76.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.49.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-elasticbeanstalk (1.51.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.38.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-elasticloadbalancing (1.40.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.75.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-elasticloadbalancingv2 (1.77.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.62.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-elasticsearchservice (1.65.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-emr (1.53.0) aws-sdk-core (~> 3, >= 3.121.2) @@ -180,38 +181,38 @@ GEM aws-sdk-eventbridge (1.24.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.46.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-firehose (1.48.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-glue (1.88.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.54.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-guardduty (1.56.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.65.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-iam (1.68.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.47.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-kafka (1.49.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.39.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-kinesis (1.41.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.53.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-kms (1.55.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.77.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-lambda (1.82.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-mq (1.40.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-networkfirewall (1.13.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-networkfirewall (1.15.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-networkmanager (1.20.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-networkmanager (1.22.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -219,23 +220,23 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.136.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-rds (1.142.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.76.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-redshift (1.80.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.60.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-route53 (1.62.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.38.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-route53domains (1.40.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.35.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-route53resolver (1.37.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.111.3) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-s3 (1.113.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sdk-s3control (1.43.0) @@ -244,8 +245,8 @@ GEM aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.60.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-securityhub (1.62.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -253,8 +254,8 @@ GEM aws-sdk-ses (1.41.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-shield (1.46.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-shield (1.48.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-signer (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) @@ -262,17 +263,17 @@ GEM aws-sdk-simpledb (1.29.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv2 (~> 1.0) - aws-sdk-sms (1.37.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-sms (1.39.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.50.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-sns (1.53.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.49.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-sqs (1.51.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.128.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-ssm (1.134.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -300,11 +301,11 @@ GEM azure_mgmt_storage (0.23.0) ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.1.0) - bson (4.14.0) + bson (4.14.1) builder (3.2.4) - chef-config (17.9.42) + chef-config (17.10.0) addressable - chef-utils (= 17.9.42) + chef-utils (= 17.10.0) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -312,12 +313,12 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.9.42) + chef-utils (17.10.0) concurrent-ruby coderay (1.1.3) - concurrent-ruby (1.1.9) - cookstyle (7.31.1) - rubocop (= 1.25.0) + concurrent-ruby (1.1.10) + cookstyle (7.32.1) + rubocop (= 1.25.1) declarative (0.0.20) diff-lcs (1.5.0) docker-api (2.2.0) @@ -327,7 +328,7 @@ GEM unf (>= 0.0.5, < 1.0.0) ed25519 (1.3.0) erubi (1.10.0) - excon (0.90.0) + excon (0.92.1) faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -369,18 +370,19 @@ GEM gyoku (1.3.1) builder (>= 2.1.2) hashie (4.1.0) + highline (2.0.3) http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.9.1) + i18n (1.10.0) concurrent-ruby (~> 1.0) inifile (3.0.0) - jmespath (1.5.0) + jmespath (1.6.1) json (2.6.1) jwt (2.3.0) - kitchen-inspec (2.5.0) + kitchen-inspec (2.5.2) hashie (>= 3.4, <= 5.0) - inspec (>= 2.2.64, < 5.0) + inspec (>= 2.2.64, < 6.0) test-kitchen (>= 2.7, < 4) kitchen-salt (0.7.2) hashie (>= 3.5) @@ -429,43 +431,47 @@ GEM net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) nori (2.6.0) + options (2.3.2) os (1.1.4) - parallel (1.21.0) - parser (3.1.0.0) + parallel (1.22.1) + parser (3.1.1.0) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) + progress_bar (1.3.3) + highline (>= 1.6, < 3) + options (~> 2.3.0) pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.6) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.2.0) + regexp_parser (2.2.1) representable (3.1.1) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) rexml (3.2.5) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.2) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.2) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) + rspec-support (~> 3.11.0) rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.10.3) + rspec-mocks (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.3) - rubocop (1.25.0) + rspec-support (~> 3.11.0) + rspec-support (3.11.0) + rubocop (1.25.1) parallel (~> 1.10) parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) @@ -474,16 +480,16 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.15.1) - parser (>= 3.0.1.1) + rubocop-ast (1.16.0) + parser (>= 3.1.1.0) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) rubyntlm (0.6.3) rubyzip (2.3.2) semverse (3.0.0) - signet (0.16.0) + signet (0.16.1) addressable (~> 2.8) - faraday (>= 0.17.3, < 2.0) + faraday (>= 0.17.5, < 3.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) sslshake (1.3.1) @@ -510,7 +516,7 @@ GEM timeliness (0.3.10) tomlrb (1.3.0) trailblazer-option (0.1.2) - train (3.8.6) + train (3.8.9) activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -521,7 +527,7 @@ GEM google-api-client (>= 0.23.9, <= 0.52.0) googleauth (>= 0.6.6, <= 0.14.0) inifile (~> 3.0) - train-core (= 3.8.6) + train-core (= 3.8.9) train-winrm (~> 0.2) train-aws (0.2.24) aws-sdk-alexaforbusiness (~> 1.0) @@ -599,7 +605,7 @@ GEM aws-sdk-synthetics (~> 1.19.0) aws-sdk-transfer (>= 1.26, < 1.35) aws-sdk-waf (~> 1.43.0) - train-core (3.8.6) + train-core (3.8.9) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) @@ -607,7 +613,7 @@ GEM net-scp (>= 1.2, < 4.0) net-ssh (>= 2.9, < 7.0) train-habitat (0.2.22) - train-winrm (0.2.12) + train-winrm (0.2.13) winrm (>= 2.3.6, < 3.0) winrm-elevated (~> 1.2.2) winrm-fs (~> 1.0) @@ -634,7 +640,7 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.8) + unf_ext (0.0.8.1) unicode-display_width (2.1.0) unicode_utils (1.4.0) winrm (2.3.6) @@ -664,7 +670,7 @@ DEPENDENCIES inspec! kitchen-docker! kitchen-inspec (>= 2.5.0) - kitchen-salt (>= 0.6.3) + kitchen-salt (>= 0.7.2) kitchen-vagrant BUNDLED WITH diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index d20413f25..b931b9795 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 261 + - 274 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 101 @@ -205,8 +205,8 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@ernstae` - `@ernstae `_ - 1 - * - :raw-html-m2r:`@arthurlogilab` - - `@arthurlogilab `_ + * - :raw-html-m2r:`@arthurzenika` + - `@arthurzenika `_ - 1 * - :raw-html-m2r:`@kakwa` - `@kakwa `_ @@ -338,4 +338,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2022-02-03. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2022-04-03. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 186363ee2..af0fb533c 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,29 @@ Changelog ========= +`1.10.2 `_ (2022-04-03) +--------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **gentoo:** use ``retry_options`` to avoid spurious service failures (\ `d00c069 `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **kitchen+gitlab:** update for new pre-salted images [skip ci] (\ `92a82a9 `_\ ) +* update linters to latest versions [skip ci] (\ `47efbc0 `_\ ) + +Tests +^^^^^ + + +* **_mapdata:** add/update verification files for Fedora & Gentoo (\ `e9cb3d2 `_\ ) +* **system:** add ``build_platform_codename`` [skip ci] (\ `6b5598a `_\ ) + `1.10.1 `_ (2022-02-03) --------------------------------------------------------------------------------------------------------- diff --git a/kitchen.yml b/kitchen.yml index 4e07582c6..1d1bcf405 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -148,6 +148,12 @@ platforms: verifier: inputs: saltmajorversion: 3004 + - name: fedora-35-master-py3 + driver: + image: saltimages/salt-master-py3:fedora-35 + verifier: + inputs: + saltmajorversion: 3004 - name: fedora-34-master-py3 driver: image: saltimages/salt-master-py3:fedora-34 @@ -224,336 +230,254 @@ platforms: inputs: saltmajorversion: 3004 - ## SALT `3004.0` - - name: debian-11-3004-0-py3 + ## SALT `3004.1` + - name: debian-11-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:debian-11 + image: saltimages/salt-3004.1-py3:debian-11 run_command: /lib/systemd/systemd verifier: inputs: saltmajorversion: 3004 - - name: debian-10-3004-0-py3 + - name: debian-10-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:debian-10 + image: saltimages/salt-3004.1-py3:debian-10 run_command: /lib/systemd/systemd verifier: inputs: saltmajorversion: 3004 - - name: debian-9-3004-0-py3 + - name: debian-9-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:debian-9 + image: saltimages/salt-3004.1-py3:debian-9 run_command: /lib/systemd/systemd verifier: inputs: saltmajorversion: 3004 - - name: ubuntu-2004-3004-0-py3 + - name: ubuntu-2004-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:ubuntu-20.04 + image: saltimages/salt-3004.1-py3:ubuntu-20.04 run_command: /lib/systemd/systemd verifier: inputs: saltmajorversion: 3004 - - name: ubuntu-1804-3004-0-py3 + - name: ubuntu-1804-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:ubuntu-18.04 + image: saltimages/salt-3004.1-py3:ubuntu-18.04 run_command: /lib/systemd/systemd verifier: inputs: saltmajorversion: 3004 - - name: centos-stream8-3004-0-py3 + - name: centos-stream8-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:centos-stream8 + image: saltimages/salt-3004.1-py3:centos-stream8 verifier: inputs: saltmajorversion: 3004 - - name: centos-7-3004-0-py3 + - name: centos-7-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:centos-7 + image: saltimages/salt-3004.1-py3:centos-7 verifier: inputs: saltmajorversion: 3004 - - name: fedora-34-3004-0-py3 + - name: fedora-35-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:fedora-34 - verifier: - inputs: - saltmajorversion: 3004 - - name: opensuse-leap-153-3004-0-py3 - driver: - image: saltimages/salt-3004.0-py3:opensuse-leap-15.3 - # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: - # => SCP did not finish successfully (255): (Net::SCP::Error) - transport: - max_ssh_sessions: 1 + image: saltimages/salt-3004.1-py3:fedora-35 verifier: inputs: saltmajorversion: 3004 - - name: opensuse-tmbl-latest-3004-0-py3 + - name: fedora-34-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:opensuse-tumbleweed-latest - # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: - # => SCP did not finish successfully (255): (Net::SCP::Error) - transport: - max_ssh_sessions: 1 + image: saltimages/salt-3004.1-py3:fedora-34 verifier: inputs: saltmajorversion: 3004 - - name: amazonlinux-2-3004-0-py3 + - name: amazonlinux-2-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:amazonlinux-2 + image: saltimages/salt-3004.1-py3:amazonlinux-2 verifier: inputs: saltmajorversion: 3004 - - name: oraclelinux-8-3004-0-py3 + - name: oraclelinux-8-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:oraclelinux-8 + image: saltimages/salt-3004.1-py3:oraclelinux-8 verifier: inputs: saltmajorversion: 3004 - - name: oraclelinux-7-3004-0-py3 + - name: oraclelinux-7-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:oraclelinux-7 + image: saltimages/salt-3004.1-py3:oraclelinux-7 verifier: inputs: saltmajorversion: 3004 - - name: arch-base-latest-3004-0-py3 + - name: arch-base-latest-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:arch-base-latest + image: saltimages/salt-3004.1-py3:arch-base-latest verifier: inputs: saltmajorversion: 3004 - - name: gentoo-stage3-latest-3004-0-py3 + - name: gentoo-stage3-latest-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:gentoo-stage3-latest + image: saltimages/salt-3004.1-py3:gentoo-stage3-latest run_command: /sbin/init verifier: inputs: saltmajorversion: 3004 - - name: gentoo-stage3-systemd-3004-0-py3 + - name: gentoo-stage3-systemd-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:gentoo-stage3-systemd + image: saltimages/salt-3004.1-py3:gentoo-stage3-systemd verifier: inputs: saltmajorversion: 3004 - - name: almalinux-8-3004-0-py3 + - name: almalinux-8-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:almalinux-8 + image: saltimages/salt-3004.1-py3:almalinux-8 verifier: inputs: saltmajorversion: 3004 - - name: rockylinux-8-3004-0-py3 + - name: rockylinux-8-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:rockylinux-8 + image: saltimages/salt-3004.1-py3:rockylinux-8 verifier: inputs: saltmajorversion: 3004 - ## SALT `3003.3` - - name: debian-10-3003-3-py3 + ## SALT `3004.0` + - name: opensuse-leap-153-3004-0-py3 driver: - image: saltimages/salt-3003.3-py3:debian-10 - run_command: /lib/systemd/systemd + image: saltimages/salt-3004.0-py3:opensuse-leap-15.3 + # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 verifier: inputs: - saltmajorversion: 3003 - - name: debian-9-3003-3-py3 + saltmajorversion: 3004 + - name: opensuse-tmbl-latest-3004-0-py3 driver: - image: saltimages/salt-3003.3-py3:debian-9 - run_command: /lib/systemd/systemd + image: saltimages/salt-3004.0-py3:opensuse-tumbleweed-latest + # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 verifier: inputs: - saltmajorversion: 3003 - - name: ubuntu-2004-3003-3-py3 + saltmajorversion: 3004 + + ## SALT `3003.4` + - name: debian-10-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:ubuntu-20.04 + image: saltimages/salt-3003.4-py3:debian-10 run_command: /lib/systemd/systemd verifier: inputs: saltmajorversion: 3003 - - name: ubuntu-1804-3003-3-py3 + - name: debian-9-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:ubuntu-18.04 + image: saltimages/salt-3003.4-py3:debian-9 run_command: /lib/systemd/systemd verifier: inputs: saltmajorversion: 3003 - - name: centos-stream8-3003-3-py3 - driver: - image: saltimages/salt-3003.3-py3:centos-stream8 - verifier: - inputs: - saltmajorversion: 3003 - - name: centos-7-3003-3-py3 + - name: ubuntu-2004-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:centos-7 - verifier: - inputs: - saltmajorversion: 3003 - - name: fedora-35-3003-3-py3 - driver: - image: saltimages/salt-3003.3-py3:fedora-35 - verifier: - inputs: - saltmajorversion: 3003 - - name: fedora-34-3003-3-py3 - driver: - image: saltimages/salt-3003.3-py3:fedora-34 - verifier: - inputs: - saltmajorversion: 3003 - - name: opensuse-leap-153-3003-3-py3 - driver: - image: saltimages/salt-3003.3-py3:opensuse-leap-15.3 - # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: - # => SCP did not finish successfully (255): (Net::SCP::Error) - transport: - max_ssh_sessions: 1 + image: saltimages/salt-3003.4-py3:ubuntu-20.04 + run_command: /lib/systemd/systemd verifier: inputs: saltmajorversion: 3003 - - name: opensuse-tmbl-latest-3003-3-py3 + - name: ubuntu-1804-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:opensuse-tumbleweed-latest - # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: - # => SCP did not finish successfully (255): (Net::SCP::Error) - transport: - max_ssh_sessions: 1 + image: saltimages/salt-3003.4-py3:ubuntu-18.04 + run_command: /lib/systemd/systemd verifier: inputs: saltmajorversion: 3003 - - name: amazonlinux-2-3003-3-py3 + - name: centos-stream8-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:amazonlinux-2 + image: saltimages/salt-3003.4-py3:centos-stream8 verifier: inputs: saltmajorversion: 3003 - - name: oraclelinux-8-3003-3-py3 + - name: centos-7-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:oraclelinux-8 + image: saltimages/salt-3003.4-py3:centos-7 verifier: inputs: saltmajorversion: 3003 - - name: oraclelinux-7-3003-3-py3 + - name: amazonlinux-2-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:oraclelinux-7 + image: saltimages/salt-3003.4-py3:amazonlinux-2 verifier: inputs: saltmajorversion: 3003 - - name: gentoo-stage3-latest-3003-3-py3 + - name: oraclelinux-8-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:gentoo-stage3-latest - run_command: /sbin/init + image: saltimages/salt-3003.4-py3:oraclelinux-8 verifier: inputs: saltmajorversion: 3003 - - name: gentoo-stage3-systemd-3003-3-py3 + - name: oraclelinux-7-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:gentoo-stage3-systemd + image: saltimages/salt-3003.4-py3:oraclelinux-7 verifier: inputs: saltmajorversion: 3003 - - name: almalinux-8-3003-3-py3 + - name: almalinux-8-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:almalinux-8 + image: saltimages/salt-3003.4-py3:almalinux-8 verifier: inputs: saltmajorversion: 3003 - ## SALT `3002.7` - - name: debian-10-3002-7-py3 + ## SALT `3002.8` + - name: debian-10-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:debian-10 + image: saltimages/salt-3002.8-py3:debian-10 run_command: /lib/systemd/systemd verifier: inputs: saltmajorversion: 3002 - - name: debian-9-3002-7-py3 + - name: debian-9-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:debian-9 + image: saltimages/salt-3002.8-py3:debian-9 run_command: /lib/systemd/systemd verifier: inputs: saltmajorversion: 3002 - - name: ubuntu-2004-3002-7-py3 + - name: ubuntu-2004-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:ubuntu-20.04 + image: saltimages/salt-3002.8-py3:ubuntu-20.04 run_command: /lib/systemd/systemd verifier: inputs: saltmajorversion: 3002 - - name: ubuntu-1804-3002-7-py3 + - name: ubuntu-1804-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:ubuntu-18.04 + image: saltimages/salt-3002.8-py3:ubuntu-18.04 run_command: /lib/systemd/systemd verifier: inputs: saltmajorversion: 3002 - - name: centos-7-3002-7-py3 - driver: - image: saltimages/salt-3002.7-py3:centos-7 - verifier: - inputs: - saltmajorversion: 3002 - - name: fedora-35-3002-7-py3 - driver: - image: saltimages/salt-3002.7-py3:fedora-35 - verifier: - inputs: - saltmajorversion: 3002 - - name: fedora-34-3002-7-py3 + - name: centos-7-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:fedora-34 + image: saltimages/salt-3002.8-py3:centos-7 verifier: inputs: saltmajorversion: 3002 - - name: opensuse-leap-153-3002-7-py3 + - name: amazonlinux-2-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:opensuse-leap-15.3 - # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: - # => SCP did not finish successfully (255): (Net::SCP::Error) - transport: - max_ssh_sessions: 1 + image: saltimages/salt-3002.8-py3:amazonlinux-2 verifier: inputs: saltmajorversion: 3002 - - name: opensuse-tmbl-latest-3002-7-py3 + - name: oraclelinux-8-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:opensuse-tumbleweed-latest - # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: - # => SCP did not finish successfully (255): (Net::SCP::Error) - transport: - max_ssh_sessions: 1 - verifier: - inputs: - saltmajorversion: 3002 - - name: amazonlinux-2-3002-7-py3 - driver: - image: saltimages/salt-3002.7-py3:amazonlinux-2 - verifier: - inputs: - saltmajorversion: 3002 - - name: oraclelinux-8-3002-7-py3 - driver: - image: saltimages/salt-3002.7-py3:oraclelinux-8 - verifier: - inputs: - saltmajorversion: 3002 - - name: oraclelinux-7-3002-7-py3 - driver: - image: saltimages/salt-3002.7-py3:oraclelinux-7 - verifier: - inputs: - saltmajorversion: 3002 - - name: gentoo-stage3-latest-3002-7-py3 - driver: - image: saltimages/salt-3002.7-py3:gentoo-stage3-latest - run_command: /sbin/init + image: saltimages/salt-3002.8-py3:oraclelinux-8 verifier: inputs: saltmajorversion: 3002 - - name: gentoo-stage3-systemd-3002-7-py3 + - name: oraclelinux-7-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:gentoo-stage3-systemd + image: saltimages/salt-3002.8-py3:oraclelinux-7 verifier: inputs: saltmajorversion: 3002 diff --git a/salt/api.sls b/salt/api.sls index bd85fb771..457b7848f 100644 --- a/salt/api.sls +++ b/salt/api.sls @@ -15,7 +15,7 @@ salt-api: service.{{ salt_settings.api_service_details.state }}: - enable: {{ salt_settings.api_service_details.enabled }} - name: {{ salt_settings.api_service }} - {%- if grains.os_family == 'FreeBSD' %} + {%- if grains.os_family in ['FreeBSD', 'Gentoo'] %} - retry: {{ salt_settings.retry_options | json }} {%- endif %} - require: diff --git a/salt/master.sls b/salt/master.sls index 577bebcef..af9d867d1 100644 --- a/salt/master.sls +++ b/salt/master.sls @@ -54,7 +54,7 @@ salt-master: service.{{ salt_settings.master_service_details.state }}: - enable: {{ salt_settings.master_service_details.enabled }} - name: {{ salt_settings.master_service }} - {%- if grains.os_family == 'FreeBSD' %} + {%- if grains.os_family in ['FreeBSD', 'Gentoo'] %} - retry: {{ salt_settings.retry_options | json }} {%- endif %} - watch: diff --git a/salt/minion.sls b/salt/minion.sls index 1a72d9ac1..e1eb8b5b7 100644 --- a/salt/minion.sls +++ b/salt/minion.sls @@ -97,7 +97,7 @@ salt-minion: service.{{ salt_settings.minion_service_details.state }}: - enable: {{ salt_settings.minion_service_details.enabled }} - name: {{ salt_settings.minion_service }} - {%- if grains.os_family == 'FreeBSD' %} + {%- if grains.os_family in ['FreeBSD', 'Gentoo'] %} - retry: {{ salt_settings.retry_options | json }} {%- endif %} - watch: diff --git a/salt/standalone.sls b/salt/standalone.sls index a14f12b8e..344cd8431 100644 --- a/salt/standalone.sls +++ b/salt/standalone.sls @@ -25,7 +25,7 @@ salt-minion-standalone: - enable: False {%- endif %} - name: {{ salt_settings.minion_service }} - {%- if grains.os_family == 'FreeBSD' %} + {%- if grains.os_family in ['FreeBSD', 'Gentoo'] %} - retry: {{ salt_settings.retry_options | json }} {%- endif %} - require: diff --git a/salt/syndic.sls b/salt/syndic.sls index d6d68759e..bd142cf30 100644 --- a/salt/syndic.sls +++ b/salt/syndic.sls @@ -18,7 +18,7 @@ salt-syndic: service.running: - enable: True - name: {{ salt_settings.syndic_service }} - {%- if grains.os_family == 'FreeBSD' %} + {%- if grains.os_family in ['FreeBSD', 'Gentoo'] %} - retry: {{ salt_settings.retry_options | json }} {%- endif %} - require: diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml index cad618d20..bf86114e3 100644 --- a/test/integration/default/files/_mapdata/fedora-34.yaml +++ b/test/integration/default/files/_mapdata/fedora-34.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -87,14 +87,14 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 pygit2: python2-pygit2 python_dulwich: python-dulwich python_git: GitPython - release: '3003' + release: '3004' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/fedora-35.yaml b/test/integration/default/files/_mapdata/fedora-35.yaml new file mode 100644 index 000000000..13c0f8129 --- /dev/null +++ b/test/integration/default/files/_mapdata/fedora-35.yaml @@ -0,0 +1,117 @@ +# yamllint disable rule:indentation rule:line-length +# Fedora-35 +--- +values: + formulas_settings: + checkout_orig_branch: false + git_opts: + default: + basedir: /srv/formulas + baseurl: https://github.com/saltstack-formulas + options: + output_loglevel: quiet + rev: master + update: false + list: {} + salt_settings: + api_service: salt-api + api_service_details: + enabled: true + state: running + clean_config_d_dir: true + cloud: + template_sources: + maps: salt://salt/files/cloud.maps.d + profiles: salt://salt/files/cloud.profiles.d + providers: salt://salt/files/cloud.providers.d + config_path: /etc/salt + gitfs: + dulwich: + install_from_source: true + gitpython: + install_from_source: false + pygit2: + git: + install_from_package: git + require_state: false + install_from_source: false + libgit2: + build_parent_dir: /usr/src/ + download_hash: 683d1164e361e2a0a8d52652840e2340 + install_from_source: true + version: 0.23.0 + version: 0.23.0 + install_packages: true + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub + master: + ext_pillar: + - cmd_yaml: cat /etc/salt/yaml + - stack: + - /path/to/stack1.cfg + - /path/to/stack2.cfg + - reclass: + inventory_base_uri: /etc/reclass + - saltclass: + - path: /srv/saltclass + file_roots: + base: + - /srv/salt + fileserver_backend: + - rootfs + gitfs_provider: pygit2 + pillar_roots: + base: + - /srv/pillar + master_config_use_TOFS: false + master_remove_config: false + master_service: salt-master + master_service_details: + enabled: true + state: running + minion: + file_roots: + base: + - /srv/salt + fileserver_backend: + - rootfs + master: localhost + master_type: str + pillar_roots: + base: + - /srv/pillar + minion_config_use_TOFS: false + minion_remove_config: false + minion_service: salt-minion + minion_service_details: + enabled: true + state: running + parallel: true + pin_version: false + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004 + pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever + pkgrepo_name: saltstack + py_ver: py3 + pygit2: python2-pygit2 + python_dulwich: python-dulwich + python_git: GitPython + release: '3004' + restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true + rootgroup: root + rootuser: root + salt_api: salt-api + salt_cloud: salt-cloud + salt_master: salt-master + salt_master_macos_plist_hash: '' + salt_minion: salt-minion + salt_minion_macos_plist_hash: '' + salt_ssh: salt-ssh + salt_syndic: salt-syndic + ssh_roster: {} + syndic_service: salt-syndic + use_pip: false + version: '' diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml index 5de1282be..008272c99 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml @@ -91,7 +91,7 @@ values: pyinotify: dev-python/pyinotify python_dulwich: python-dulwich python_git: python-git - release: '3003' + release: '3004' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml index 5de1282be..008272c99 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml @@ -91,7 +91,7 @@ values: pyinotify: dev-python/pyinotify python_dulwich: python-dulwich python_git: python-git - release: '3003' + release: '3004' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb index 7471ddcfc..64fe7ea73 100644 --- a/test/integration/share/libraries/system.rb +++ b/test/integration/share/libraries/system.rb @@ -4,6 +4,7 @@ # Author: Daniel Dehennin # Copyright (C) 2020 Daniel Dehennin +# rubocop:disable Metrics/ClassLength class SystemResource < Inspec.resource(1) name 'system' @@ -21,7 +22,8 @@ def build_platform family: build_platform_family, name: build_platform_name, release: build_platform_release, - finger: build_platform_finger + finger: build_platform_finger, + codename: build_platform_codename } end @@ -89,4 +91,44 @@ def build_finger_release build_platform_release.split('.')[0] end end + + # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity + def build_platform_codename + case build_platform_finger + when 'ubuntu-20.04' + 'focal' + when 'ubuntu-18.04' + 'bionic' + when 'debian-11' + 'bullseye' + when 'debian-10' + 'buster' + when 'debian-9' + 'stretch' + when 'almalinux-8' + "AlmaLinux #{build_platform_release} (Arctic Sphynx)" + when 'amazonlinux-2' + 'Amazon Linux 2' + when 'arch-base-latest' + 'Arch Linux' + when 'centos-7' + 'CentOS Linux 7 (Core)' + when 'centos-8' + 'CentOS Stream 8' + when 'opensuse-tumbleweed' + 'openSUSE Tumbleweed' + when 'opensuse-15' + "openSUSE Leap #{build_platform_release}" + when 'oraclelinux-8', 'oraclelinux-7' + "Oracle Linux Server #{build_platform_release}" + when 'gentoo-2-sysd', 'gentoo-2-sysv' + 'Gentoo/Linux' + when 'rockylinux-8' + "Rocky Linux #{build_platform_release} (Green Obsidian)" + else + '' + end + end + # rubocop:enable Metrics/MethodLength,Metrics/CyclomaticComplexity end +# rubocop:enable Metrics/ClassLength