diff --git a/.copier-answers.ssf-ci.yml b/.copier-answers.ssf-ci.yml index 563a29c..29777e7 100644 --- a/.copier-answers.ssf-ci.yml +++ b/.copier-answers.ssf-ci.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: v2.11.7 +_commit: v2.11.11 _src_path: https://github.com/dafyddj/copier-ssf-ci failure_permitted_ignored: [] failure_permitted_patterns: [] diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 49e4e5f..2396efe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,7 +25,7 @@ jobs: name: Lint / `pre-commit` needs: should-run if: fromJSON(needs.should-run.outputs.should-run) - container: techneg/ci-pre-commit:v2.5.52@sha256:c5ce7075611cc185ea8e0992dec3cf1157382452f6ede9be86bee8baed09395d + container: techneg/ci-pre-commit:v2.5.58@sha256:56e0bf7d16560020b738a2378240643ccb399350a540e906ca1e27009ffe2d68 runs-on: ubuntu-latest timeout-minutes: 10 steps: @@ -61,7 +61,7 @@ jobs: issues: write pull-requests: write checks: read - container: techneg/ci-semantic-release:v1.2.51@sha256:a57103734a036c435ec6a1adb35a823eeb20498794bd9020e2fb01eb3b96baa3 + container: techneg/ci-semantic-release:v1.2.58@sha256:723edbddfa534c7c137f09adec5fb2dfd6286d3fcb9c63688d7e5265ca4dd77e runs-on: ubuntu-latest timeout-minutes: 15 steps: @@ -69,11 +69,11 @@ jobs: git config --global --add safe.directory "$GITHUB_WORKSPACE" - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 # yamllint disable-line rule:line-length - - uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0 + - uses: poseidon/wait-for-status-checks@e7e24423722c5b8e97a6dd5848827d2a412f812d # v0.7.0 with: ignore: > Dependabot, - Release / Collect results + Release / Collect results, ignore_pattern: ^GitLab CI token: ${{ secrets.GITHUB_TOKEN }} - name: Run `semantic-release` diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 607ac3b..d228f0b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,15 +15,14 @@ stage_test: &stage_test 'test' # `image` # yamllint disable rule:line-length - image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.150@sha256:2d2de135abb0129cabe4fb282add9db5367a738db21396b5d45905b9a7820ff5' - image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.119@sha256:ce526677c95f95d50559d42f0b934c90c8cb0ec9d67bcd95c156f8cf51f10a82' - image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.119@sha256:ce526677c95f95d50559d42f0b934c90c8cb0ec9d67bcd95c156f8cf51f10a82' - image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.52@sha256:c5ce7075611cc185ea8e0992dec3cf1157382452f6ede9be86bee8baed09395d' - image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:a2abed57112d1931b77b30138d8f6a211303f10f2d03d42513cfbe7de1e25963' - image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.51@sha256:a57103734a036c435ec6a1adb35a823eeb20498794bd9020e2fb01eb3b96baa3' + image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.156@sha256:90b61f1eadad21123849ef29ee63ba796aa74be868942fb4e623efd6ced4b624' + image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.125@sha256:216120abc59355bd84b9dcad97d10f40884dbc41139971605eb8474f1a9e00b9' + image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.125@sha256:216120abc59355bd84b9dcad97d10f40884dbc41139971605eb8474f1a9e00b9' + image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.5.58@sha256:56e0bf7d16560020b738a2378240643ccb399350a540e906ca1e27009ffe2d68' + image_semantic-release: &image_semanticrelease 'techneg/ci-semantic-release:v1.2.58@sha256:723edbddfa534c7c137f09adec5fb2dfd6286d3fcb9c63688d7e5265ca4dd77e' # `services` services_docker_dind: &services_docker_dind - - 'docker:29.6.2-dind@sha256:bfec1f5159c63a81ca6fdedbd81404d2c0e16378ed0feec3bb3fbf3998847659' + - 'docker:29.8.0-dind@sha256:5efed980cba3fc126cf54e21a5a6ff8849d05b6e0623d6e7612f48e9cd6cd17e' # yamllint enable rule:line-length # `variables` # https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3 @@ -77,7 +76,7 @@ build-cache: script: *bundle_install ############################################################################### -# `lint` stage: `commitlint`, `pre-commit` & `rubocop` (latest, failure allowed) +# `lint` stage: `commitlint`, `pre-commit` ############################################################################### .lint_job: stage: *stage_lint @@ -113,19 +112,6 @@ pre-commit: - 'pre-commit run --all-files --color always --verbose' - 'pre-commit run --color always --hook-stage manual commitlint-ci' -# Use a separate job for `rubocop` other than the one potentially run by `pre-commit` -# - The `pre-commit` check will only be available for formulas that pass the default -# `rubocop` check -- and must continue to do so -# - This job is allowed to fail, so can be used for all formulas -# - Furthermore, this job uses all of the latest `rubocop` features & cops, -# which will help when upgrading the `rubocop` linter used in `pre-commit` -rubocop: - extends: '.lint_job' - allow_failure: true - image: *image_rubocop - script: - - 'rubocop -d -P -S --enable-pending-cops' - ############################################################################### # Define `test` template ############################################################################### @@ -166,73 +152,55 @@ almalinux-8-master: {extends: '.test_instance_failure_permitted'} amazonlinux-2023-master: {extends: '.test_instance_failure_permitted'} amazonlinux-2-master: {extends: '.test_instance_failure_permitted'} centos-stream9-master: {extends: '.test_instance_failure_permitted'} +debian-13-master: {extends: '.test_instance_failure_permitted'} debian-12-master: {extends: '.test_instance_failure_permitted'} -debian-11-master: {extends: '.test_instance_failure_permitted'} -fedora-41-master: {extends: '.test_instance_failure_permitted'} -fedora-40-master: {extends: '.test_instance_failure_permitted'} -opensuse-leap-156-master: {extends: '.test_instance_failure_permitted'} +fedora-44-master: {extends: '.test_instance_failure_permitted'} +fedora-43-master: {extends: '.test_instance_failure_permitted'} +opensuse-leap-160-master: {extends: '.test_instance_failure_permitted'} opensuse-tmbl-latest-master: {extends: '.test_instance_failure_permitted'} oraclelinux-9-master: {extends: '.test_instance_failure_permitted'} oraclelinux-8-master: {extends: '.test_instance_failure_permitted'} rockylinux-9-master: {extends: '.test_instance_failure_permitted'} rockylinux-8-master: {extends: '.test_instance_failure_permitted'} +ubuntu-2604-master: {extends: '.test_instance_failure_permitted'} ubuntu-2404-master: {extends: '.test_instance_failure_permitted'} ubuntu-2204-master: {extends: '.test_instance_failure_permitted'} -ubuntu-2004-master: {extends: '.test_instance_failure_permitted'} almalinux-9-3008: {extends: '.test_instance'} almalinux-8-3008: {extends: '.test_instance'} amazonlinux-2023-3008: {extends: '.test_instance'} amazonlinux-2-3008: {extends: '.test_instance_failure_permitted'} centos-stream9-3008: {extends: '.test_instance'} +debian-13-3008: {extends: '.test_instance'} debian-12-3008: {extends: '.test_instance'} -debian-11-3008: {extends: '.test_instance'} -fedora-41-3008: {extends: '.test_instance_failure_permitted'} -fedora-40-3008: {extends: '.test_instance'} -opensuse-leap-156-3008: {extends: '.test_instance'} +fedora-44-3008: {extends: '.test_instance'} +fedora-43-3008: {extends: '.test_instance'} +opensuse-leap-160-3008: {extends: '.test_instance'} opensuse-tmbl-latest-3008: {extends: '.test_instance'} oraclelinux-9-3008: {extends: '.test_instance'} oraclelinux-8-3008: {extends: '.test_instance'} rockylinux-9-3008: {extends: '.test_instance'} rockylinux-8-3008: {extends: '.test_instance'} +ubuntu-2604-3008: {extends: '.test_instance'} ubuntu-2404-3008: {extends: '.test_instance'} ubuntu-2204-3008: {extends: '.test_instance'} -ubuntu-2004-3008: {extends: '.test_instance'} -almalinux-9-3007: {extends: '.test_instance'} -almalinux-8-3007: {extends: '.test_instance'} -amazonlinux-2023-3007: {extends: '.test_instance'} -amazonlinux-2-3007: {extends: '.test_instance_failure_permitted'} -centos-stream9-3007: {extends: '.test_instance'} -debian-12-3007: {extends: '.test_instance'} -debian-11-3007: {extends: '.test_instance'} -fedora-41-3007: {extends: '.test_instance_failure_permitted'} -fedora-40-3007: {extends: '.test_instance'} -opensuse-leap-156-3007: {extends: '.test_instance'} -opensuse-tmbl-latest-3007: {extends: '.test_instance'} -oraclelinux-9-3007: {extends: '.test_instance'} -oraclelinux-8-3007: {extends: '.test_instance'} -rockylinux-9-3007: {extends: '.test_instance'} -rockylinux-8-3007: {extends: '.test_instance'} -ubuntu-2404-3007: {extends: '.test_instance'} -ubuntu-2204-3007: {extends: '.test_instance'} -ubuntu-2004-3007: {extends: '.test_instance'} almalinux-9-3006: {extends: '.test_instance'} almalinux-8-3006: {extends: '.test_instance'} amazonlinux-2023-3006: {extends: '.test_instance'} amazonlinux-2-3006: {extends: '.test_instance_failure_permitted'} centos-stream9-3006: {extends: '.test_instance'} +debian-13-3006: {extends: '.test_instance'} debian-12-3006: {extends: '.test_instance'} -debian-11-3006: {extends: '.test_instance'} -fedora-41-3006: {extends: '.test_instance_failure_permitted'} -fedora-40-3006: {extends: '.test_instance'} -opensuse-leap-156-3006: {extends: '.test_instance'} +fedora-44-3006: {extends: '.test_instance'} +fedora-43-3006: {extends: '.test_instance'} +opensuse-leap-160-3006: {extends: '.test_instance'} opensuse-tmbl-latest-3006: {extends: '.test_instance'} oraclelinux-9-3006: {extends: '.test_instance'} oraclelinux-8-3006: {extends: '.test_instance'} rockylinux-9-3006: {extends: '.test_instance'} rockylinux-8-3006: {extends: '.test_instance'} +ubuntu-2604-3006: {extends: '.test_instance'} ubuntu-2404-3006: {extends: '.test_instance'} ubuntu-2204-3006: {extends: '.test_instance'} -ubuntu-2004-3006: {extends: '.test_instance'} # yamllint enable rule:line-length ############################################################################### diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 977bfdf..0a0973c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -29,12 +29,12 @@ repos: hooks: - id: commitlint - id: commitlint-ci - - repo: https://github.com/rubocop-hq/rubocop - rev: v1.88.2 + - repo: https://github.com/rubocop/rubocop + rev: v1.90.0 hooks: - id: rubocop name: Check Ruby files with rubocop - args: [--debug] + args: [--debug, --display-style-guide] - repo: https://github.com/shellcheck-py/shellcheck-py rev: v0.9.0.6 hooks: @@ -80,7 +80,7 @@ repos: name: Check Salt files using salt-lint files: ^.*\.(sls|jinja|j2|tmpl|tst)$ - repo: https://github.com/rstcheck/rstcheck - rev: v6.2.5 + rev: v6.3.0 hooks: - id: rstcheck name: Check reST files using rstcheck @@ -100,12 +100,12 @@ repos: )$ additional_dependencies: [pygments==2.16.1] - repo: https://github.com/renovatebot/pre-commit-hooks - rev: 43.285.3 + rev: 44.69.12 hooks: - id: renovate-config-validator name: Check Renovate config with renovate-config-validator - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.37.4 + rev: 0.38.0 hooks: - id: check-github-workflows name: Check GitHub workflows with check-jsonschema diff --git a/Gemfile b/Gemfile index f084722..d175101 100644 --- a/Gemfile +++ b/Gemfile @@ -8,16 +8,14 @@ source ENV.fetch('PROXY_RUBYGEMSORG', 'https://rubygems.org') # Install the `inspec` gem using `git` because versions after `4.22.22` # suppress diff output; this version fixes this for our uses. -# rubocop:disable Layout/LineLength +# rubocop:disable-next Layout/LineLength gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec', branch: 'ssf' -# rubocop:enable Layout/LineLength # Install the `kitchen-docker` gem using `git` in order to avoid an upstream # error caused by `kitchen-docker.gemspec`. # TODO: correct the error upstream -# rubocop:disable Layout/LineLength +# rubocop:disable-next Layout/LineLength gem 'kitchen-docker', git: 'https://github.com/dafyddj/kitchen-docker', branch: 'chore/gemspec' -# rubocop:enable Layout/LineLength gem 'kitchen-inspec', '3.1.0' gem 'kitchen-salt', '0.7.2' diff --git a/Gemfile.lock b/Gemfile.lock index e022c32..969dfa1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -464,7 +464,7 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) jmespath (1.6.2) - json (2.20.0) + json (2.21.2) jwt (3.2.0) base64 kitchen-inspec (3.1.0) diff --git a/kitchen.yml b/kitchen.yml index 0f791f6..c62d325 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -26,13 +26,17 @@ transport: platforms: ## SALT `master` + - name: debian-13-master + driver: + image: saltimages/salt-master-py3:debian-13 + run_command: /lib/systemd/systemd - name: debian-12-master driver: image: saltimages/salt-master-py3:debian-12 run_command: /lib/systemd/systemd - - name: debian-11-master + - name: ubuntu-2604-master driver: - image: saltimages/salt-master-py3:debian-11 + image: saltimages/salt-master-py3:ubuntu-26.04 run_command: /lib/systemd/systemd - name: ubuntu-2404-master driver: @@ -42,17 +46,13 @@ platforms: driver: image: saltimages/salt-master-py3:ubuntu-22.04 run_command: /lib/systemd/systemd - - name: ubuntu-2004-master - driver: - image: saltimages/salt-master-py3:ubuntu-20.04 - run_command: /lib/systemd/systemd - name: centos-stream9-master driver: image: saltimages/salt-master-py3:centos-stream9 - - name: opensuse-leap-156-master + - name: opensuse-leap-160-master driver: - image: saltimages/salt-master-py3:opensuse-leap-15.6 - # Workaround to avoid intermittent failures on `opensuse-leap-15.6`: + image: saltimages/salt-master-py3:opensuse-leap-16.0 + # Workaround to avoid intermittent failures on `opensuse-leap-16.0`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 @@ -63,12 +63,12 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: fedora-41-master + - name: fedora-44-master driver: - image: saltimages/salt-master-py3:fedora-41 - - name: fedora-40-master + image: saltimages/salt-master-py3:fedora-44 + - name: fedora-43-master driver: - image: saltimages/salt-master-py3:fedora-40 + image: saltimages/salt-master-py3:fedora-43 - name: amazonlinux-2023-master driver: image: saltimages/salt-master-py3:amazonlinux-2023 @@ -91,212 +91,143 @@ platforms: driver: image: saltimages/salt-master-py3:rockylinux-8 - ## SALT `3008.0` - - name: debian-12-3008-0 + ## SALT `3008.2` + - name: debian-13-3008-2 driver: - image: saltimages/salt-3008.0-py3:debian-12 + image: saltimages/salt-3008.2-py3:debian-13 run_command: /lib/systemd/systemd - - name: debian-11-3008-0 + - name: debian-12-3008-2 driver: - image: saltimages/salt-3008.0-py3:debian-11 + image: saltimages/salt-3008.2-py3:debian-12 run_command: /lib/systemd/systemd - - name: ubuntu-2404-3008-0 + - name: ubuntu-2604-3008-2 driver: - image: saltimages/salt-3008.0-py3:ubuntu-24.04 + image: saltimages/salt-3008.2-py3:ubuntu-26.04 run_command: /lib/systemd/systemd - - name: ubuntu-2204-3008-0 + - name: ubuntu-2404-3008-2 driver: - image: saltimages/salt-3008.0-py3:ubuntu-22.04 + image: saltimages/salt-3008.2-py3:ubuntu-24.04 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3008-0 + - name: ubuntu-2204-3008-2 driver: - image: saltimages/salt-3008.0-py3:ubuntu-20.04 + image: saltimages/salt-3008.2-py3:ubuntu-22.04 run_command: /lib/systemd/systemd - - name: centos-stream9-3008-0 + - name: centos-stream9-3008-2 driver: - image: saltimages/salt-3008.0-py3:centos-stream9 - - name: opensuse-leap-156-3008-0 + image: saltimages/salt-3008.2-py3:centos-stream9 + - name: opensuse-leap-160-3008-2 driver: - image: saltimages/salt-3008.0-py3:opensuse-leap-15.6 - # Workaround to avoid intermittent failures on `opensuse-leap-15.6`: + image: saltimages/salt-3008.2-py3:opensuse-leap-16.0 + # Workaround to avoid intermittent failures on `opensuse-leap-16.0`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-tmbl-latest-3008-0 + - name: opensuse-tmbl-latest-3008-2 driver: - image: saltimages/salt-3008.0-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3008.2-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 - - name: fedora-41-3008-0 + - name: fedora-44-3008-2 driver: - image: saltimages/salt-3008.0-py3:fedora-41 - - name: fedora-40-3008-0 + image: saltimages/salt-3008.2-py3:fedora-44 + - name: fedora-43-3008-2 driver: - image: saltimages/salt-3008.0-py3:fedora-40 - - name: amazonlinux-2023-3008-0 + image: saltimages/salt-3008.2-py3:fedora-43 + - name: amazonlinux-2023-3008-2 driver: - image: saltimages/salt-3008.0-py3:amazonlinux-2023 - - name: amazonlinux-2-3008-0 + image: saltimages/salt-3008.2-py3:amazonlinux-2023 + - name: amazonlinux-2-3008-2 driver: - image: saltimages/salt-3008.0-py3:amazonlinux-2 - - name: oraclelinux-9-3008-0 + image: saltimages/salt-3008.2-py3:amazonlinux-2 + - name: oraclelinux-9-3008-2 driver: - image: saltimages/salt-3008.0-py3:oraclelinux-9 - - name: oraclelinux-8-3008-0 + image: saltimages/salt-3008.2-py3:oraclelinux-9 + - name: oraclelinux-8-3008-2 driver: - image: saltimages/salt-3008.0-py3:oraclelinux-8 - - name: almalinux-9-3008-0 + image: saltimages/salt-3008.2-py3:oraclelinux-8 + - name: almalinux-9-3008-2 driver: - image: saltimages/salt-3008.0-py3:almalinux-9 - - name: almalinux-8-3008-0 + image: saltimages/salt-3008.2-py3:almalinux-9 + - name: almalinux-8-3008-2 driver: - image: saltimages/salt-3008.0-py3:almalinux-8 - - name: rockylinux-9-3008-0 + image: saltimages/salt-3008.2-py3:almalinux-8 + - name: rockylinux-9-3008-2 driver: - image: saltimages/salt-3008.0-py3:rockylinux-9 - - name: rockylinux-8-3008-0 + image: saltimages/salt-3008.2-py3:rockylinux-9 + - name: rockylinux-8-3008-2 driver: - image: saltimages/salt-3008.0-py3:rockylinux-8 + image: saltimages/salt-3008.2-py3:rockylinux-8 - ## SALT `3007.14` - - name: debian-12-3007-14 + ## SALT `3006.27` + - name: debian-13-3006-27 driver: - image: saltimages/salt-3007.14-py3:debian-12 + image: saltimages/salt-3006.27-py3:debian-13 run_command: /lib/systemd/systemd - - name: debian-11-3007-14 + - name: debian-12-3006-27 driver: - image: saltimages/salt-3007.14-py3:debian-11 + image: saltimages/salt-3006.27-py3:debian-12 run_command: /lib/systemd/systemd - - name: ubuntu-2404-3007-14 + - name: ubuntu-2604-3006-27 driver: - image: saltimages/salt-3007.14-py3:ubuntu-24.04 + image: saltimages/salt-3006.27-py3:ubuntu-26.04 run_command: /lib/systemd/systemd - - name: ubuntu-2204-3007-14 + - name: ubuntu-2404-3006-27 driver: - image: saltimages/salt-3007.14-py3:ubuntu-22.04 + image: saltimages/salt-3006.27-py3:ubuntu-24.04 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3007-14 + - name: ubuntu-2204-3006-27 driver: - image: saltimages/salt-3007.14-py3:ubuntu-20.04 + image: saltimages/salt-3006.27-py3:ubuntu-22.04 run_command: /lib/systemd/systemd - - name: centos-stream9-3007-14 + - name: centos-stream9-3006-27 driver: - image: saltimages/salt-3007.14-py3:centos-stream9 - - name: opensuse-leap-156-3007-14 + image: saltimages/salt-3006.27-py3:centos-stream9 + - name: opensuse-tmbl-latest-3006-27 driver: - image: saltimages/salt-3007.14-py3:opensuse-leap-15.6 - # Workaround to avoid intermittent failures on `opensuse-leap-15.6`: - # => SCP did not finish successfully (255): (Net::SCP::Error) - transport: - max_ssh_sessions: 1 - - name: opensuse-tmbl-latest-3007-14 - driver: - image: saltimages/salt-3007.14-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3006.27-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 - - name: fedora-41-3007-14 + - name: opensuse-leap-160-3006-27 driver: - image: saltimages/salt-3007.14-py3:fedora-41 - - name: fedora-40-3007-14 - driver: - image: saltimages/salt-3007.14-py3:fedora-40 - - name: amazonlinux-2023-3007-14 - driver: - image: saltimages/salt-3007.14-py3:amazonlinux-2023 - - name: amazonlinux-2-3007-14 - driver: - image: saltimages/salt-3007.14-py3:amazonlinux-2 - - name: oraclelinux-9-3007-14 - driver: - image: saltimages/salt-3007.14-py3:oraclelinux-9 - - name: oraclelinux-8-3007-14 - driver: - image: saltimages/salt-3007.14-py3:oraclelinux-8 - - name: almalinux-9-3007-14 - driver: - image: saltimages/salt-3007.14-py3:almalinux-9 - - name: almalinux-8-3007-14 - driver: - image: saltimages/salt-3007.14-py3:almalinux-8 - - name: rockylinux-9-3007-14 - driver: - image: saltimages/salt-3007.14-py3:rockylinux-9 - - name: rockylinux-8-3007-14 - driver: - image: saltimages/salt-3007.14-py3:rockylinux-8 - - ## SALT `3006.25` - - name: debian-12-3006-25 - driver: - image: saltimages/salt-3006.25-py3:debian-12 - run_command: /lib/systemd/systemd - - name: debian-11-3006-25 - driver: - image: saltimages/salt-3006.25-py3:debian-11 - run_command: /lib/systemd/systemd - - name: ubuntu-2404-3006-25 - driver: - image: saltimages/salt-3006.25-py3:ubuntu-24.04 - run_command: /lib/systemd/systemd - - name: ubuntu-2204-3006-25 - driver: - image: saltimages/salt-3006.25-py3:ubuntu-22.04 - run_command: /lib/systemd/systemd - - name: ubuntu-2004-3006-25 - driver: - image: saltimages/salt-3006.25-py3:ubuntu-20.04 - run_command: /lib/systemd/systemd - - name: centos-stream9-3006-25 - driver: - image: saltimages/salt-3006.25-py3:centos-stream9 - - name: opensuse-tmbl-latest-3006-25 - driver: - image: saltimages/salt-3006.25-py3:opensuse-tumbleweed-latest - # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: + image: saltimages/salt-3006.27-py3:opensuse-leap-16.0 + # Workaround to avoid intermittent failures on `opensuse-leap-16.0`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-leap-156-3006-25 + - name: fedora-44-3006-27 driver: - image: saltimages/salt-3006.25-py3:opensuse-leap-15.6 - # Workaround to avoid intermittent failures on `opensuse-leap-15.6`: - # => SCP did not finish successfully (255): (Net::SCP::Error) - transport: - max_ssh_sessions: 1 - - name: fedora-41-3006-25 + image: saltimages/salt-3006.27-py3:fedora-44 + - name: fedora-43-3006-27 driver: - image: saltimages/salt-3006.25-py3:fedora-41 - - name: fedora-40-3006-25 + image: saltimages/salt-3006.27-py3:fedora-43 + - name: amazonlinux-2023-3006-27 driver: - image: saltimages/salt-3006.25-py3:fedora-40 - - name: amazonlinux-2023-3006-25 + image: saltimages/salt-3006.27-py3:amazonlinux-2023 + - name: amazonlinux-2-3006-27 driver: - image: saltimages/salt-3006.25-py3:amazonlinux-2023 - - name: amazonlinux-2-3006-25 + image: saltimages/salt-3006.27-py3:amazonlinux-2 + - name: oraclelinux-9-3006-27 driver: - image: saltimages/salt-3006.25-py3:amazonlinux-2 - - name: oraclelinux-9-3006-25 + image: saltimages/salt-3006.27-py3:oraclelinux-9 + - name: oraclelinux-8-3006-27 driver: - image: saltimages/salt-3006.25-py3:oraclelinux-9 - - name: oraclelinux-8-3006-25 + image: saltimages/salt-3006.27-py3:oraclelinux-8 + - name: almalinux-9-3006-27 driver: - image: saltimages/salt-3006.25-py3:oraclelinux-8 - - name: almalinux-9-3006-25 + image: saltimages/salt-3006.27-py3:almalinux-9 + - name: almalinux-8-3006-27 driver: - image: saltimages/salt-3006.25-py3:almalinux-9 - - name: almalinux-8-3006-25 + image: saltimages/salt-3006.27-py3:almalinux-8 + - name: rockylinux-9-3006-27 driver: - image: saltimages/salt-3006.25-py3:almalinux-8 - - name: rockylinux-9-3006-25 + image: saltimages/salt-3006.27-py3:rockylinux-9 + - name: rockylinux-8-3006-27 driver: - image: saltimages/salt-3006.25-py3:rockylinux-9 - - name: rockylinux-8-3006-25 - driver: - image: saltimages/salt-3006.25-py3:rockylinux-8 + image: saltimages/salt-3006.27-py3:rockylinux-8 ########################################################## # This file is managed as part of a Copier template. # diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb index 64405bb..8b34968 100644 --- a/test/integration/share/libraries/system.rb +++ b/test/integration/share/libraries/system.rb @@ -4,7 +4,11 @@ # Author: Daniel Dehennin # Copyright (C) 2020 Daniel Dehennin +<<<<<<< before updating # rubocop:disable Metrics/ClassLength +======= +# rubocop:disable-next Metrics/ClassLength +>>>>>>> after updating class SystemResource < Inspec.resource(1) name 'system' @@ -47,7 +51,11 @@ class SystemResource < Inspec.resource(1) end end +<<<<<<< before updating # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity +======= + # rubocop:disable-next Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity +>>>>>>> after updating def build_platform_release case inspec.platform[:name] when 'amazon' @@ -60,9 +68,15 @@ class SystemResource < Inspec.resource(1) when 'mac_os_x' inspec.command('sw_vers -productVersion').stdout.to_s when 'opensuse' +<<<<<<< before updating # rubocop:disable Style/NumericLiterals,Layout/LineLength inspec.platform[:release].to_i > 20210101 ? 'tumbleweed' : inspec.platform[:release] # rubocop:enable Style/NumericLiterals,Layout/LineLength +======= + release = inspec.platform[:release] + # rubocop:disable-next Style/NumericLiterals + release.to_i > 20210101 ? 'tumbleweed' : release +>>>>>>> after updating when 'windows_8.1_pro' '8.1' when 'windows_server_2022_datacenter' @@ -75,7 +89,10 @@ class SystemResource < Inspec.resource(1) inspec.platform[:release] end end +<<<<<<< before updating # rubocop:enable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity +======= +>>>>>>> after updating def derive_gentoo_init_system inspec.command('systemctl').exist? ? 'sysd' : 'sysv' @@ -94,7 +111,11 @@ class SystemResource < Inspec.resource(1) end end +<<<<<<< before updating # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity +======= + # rubocop:disable-next Metrics/MethodLength,Metrics/CyclomaticComplexity +>>>>>>> after updating def build_platform_codename case build_platform_finger when 'ubuntu-22.04' @@ -133,6 +154,10 @@ class SystemResource < Inspec.resource(1) '' end end +<<<<<<< before updating # rubocop:enable Metrics/MethodLength,Metrics/CyclomaticComplexity end # rubocop:enable Metrics/ClassLength +======= +end +>>>>>>> after updating diff --git a/test/salt/pillar/.gitkeep b/test/salt/pillar/.gitkeep new file mode 100644 index 0000000..e69de29