Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: saltstack-formulas/template-formula
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v5.0.8
Choose a base ref
...
head repository: saltstack-formulas/template-formula
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Mar 4, 2022

  1. Copy the full SHA
    a8c8f81 View commit details

Commits on Mar 12, 2022

  1. Copy the full SHA
    6b04b95 View commit details

Commits on Mar 17, 2022

  1. Copy the full SHA
    5ce256d View commit details

Commits on Mar 22, 2022

  1. Copy the full SHA
    409bfc5 View commit details

Commits on Mar 30, 2022

  1. Copy the full SHA
    6f02d2c View commit details

Commits on Apr 1, 2022

  1. Copy the full SHA
    bbc8e2d View commit details

Commits on Apr 3, 2022

  1. Copy the full SHA
    801be3d View commit details

Commits on Apr 4, 2022

  1. Copy the full SHA
    2dcea70 View commit details

Commits on Apr 11, 2022

  1. Copy the full SHA
    4a38a29 View commit details
  2. Copy the full SHA
    7d256e3 View commit details

Commits on Apr 18, 2022

  1. Copy the full SHA
    6be1e23 View commit details

Commits on Apr 25, 2022

  1. Copy the full SHA
    876385a View commit details
  2. ci(gitlab-ci): use Node 16.x for pre-commit in test conversion job

    The `test_conversion` job failed during the weekly testing:
    
    * https://gitlab.com/myii/template-formula/-/jobs/2371193438
    
    The `stderr` being:
    
    ```
    /root/.cache/pre-commit/repomigj3p4n/node_env-default/bin/node:
    /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found
    (required by /root/.cache/pre-commit/repomigj3p4n/node_env-default/bin/node)
    ```
    
    The following references led to this resolution:
    
    * pre-commit/pre-commit#2351
    * https://stackoverflow.com/questions/71939099/bitbucket-pipeline-error-installing-pre-commit-ts-lint
    
    As mentioned there:
    
    > a few days ago node 18.x was released and the prebuilt binaries
    > require a relatively-recent version of glibc
    
    Which obviously isn't available on our current Bionic-based `dind` image,
    i.e. 'myii/ssf-dind-ruby-bionic:2.7.5-1bbox1'.
    
    While debugging this situation locally, noticed that the use of a
    relative `tmp/...` subdirectory was within the `template-formula`
    directory itself -- so switched this to using `/tmp/...` instead.
    myii committed Apr 25, 2022
    Copy the full SHA
    a1a46ae View commit details
  3. Merge pull request #249 from myii/ci/use-node-16-for-test-conversion-…

    …pre-commit
    
    ci(gitlab-ci): use Node `16.x` for `pre-commit` in test conversion job
    myii authored Apr 25, 2022
    Copy the full SHA
    bdf294e View commit details
  4. chore(release): 5.0.9 [skip ci]

    ## [5.0.9](v5.0.8...v5.0.9) (2022-04-25)
    
    ### Continuous Integration
    
    * **gitlab-ci:** use Node `16.x` for `pre-commit` in test conversion job ([a1a46ae](a1a46ae))
    * **kitchen+gitlab:** update for new pre-salted images [skip ci] ([801be3d](801be3d))
    
    ### Tests
    
    * **_mapdata:** add verification file for `fedora-35` [skip ci] ([6f02d2c](6f02d2c))
    * **_mapdata:** add verification file for `fedora-36` [skip ci] ([4a38a29](4a38a29))
    semantic-release-bot committed Apr 25, 2022
    Copy the full SHA
    0d1f0dd View commit details

Commits on May 6, 2022

  1. Copy the full SHA
    e16130d View commit details

Commits on May 10, 2022

  1. Copy the full SHA
    1703b38 View commit details
  2. Copy the full SHA
    9349c83 View commit details
  3. Copy the full SHA
    6ea1cc2 View commit details

Commits on May 17, 2022

  1. Copy the full SHA
    d46507b View commit details
  2. Copy the full SHA
    de7e21c View commit details

Commits on May 30, 2022

  1. Copy the full SHA
    c090f3d View commit details

Commits on Jun 7, 2022

  1. Copy the full SHA
    2e2aa10 View commit details

Commits on Jun 8, 2022

  1. Copy the full SHA
    32518b9 View commit details

Commits on Jun 15, 2022

  1. Copy the full SHA
    5e5aa74 View commit details

Commits on Jun 30, 2022

  1. Copy the full SHA
    e7fc7eb View commit details

Commits on Jul 17, 2022

  1. Copy the full SHA
    fc04282 View commit details

Commits on May 3, 2023

  1. Copy the full SHA
    7da11c9 View commit details

Commits on Sep 11, 2023

  1. Copy the full SHA
    3d1581e View commit details

Commits on Sep 12, 2023

  1. Merge pull request #257 from blu-base/fix_typo_docstr

    style(default.sls): fix minor typo
    baby-gnu authored Sep 12, 2023
    Copy the full SHA
    486da97 View commit details

Commits on Sep 22, 2023

  1. Merge pull request #256 from jeff350/saltlint-bump-version-0.9.2

    chore: broken install-hooks due to saltlint v0.8.0
    jeff350 authored Sep 22, 2023
    Copy the full SHA
    14c0639 View commit details

Commits on Oct 11, 2023

  1. Copy the full SHA
    2bd3ef9 View commit details
  2. style(inspec): fix whitespace

    dafyddj committed Oct 11, 2023
    Copy the full SHA
    1df9861 View commit details
  3. Copy the full SHA
    c69928d View commit details
  4. Copy the full SHA
    b2c28aa View commit details

Commits on Oct 17, 2023

  1. Copy the full SHA
    20bf1d5 View commit details

Commits on Oct 25, 2023

  1. Copy the full SHA
    b84343e View commit details

Commits on Oct 30, 2023

  1. Merge pull request #259 from dafyddj/tmp/testing

    chore: update and fix `pre-commit` checks
    dafyddj authored Oct 30, 2023
    Copy the full SHA
    d238e78 View commit details

Commits on Nov 9, 2023

  1. test(pre-commit): switch to using pre-commit's built-in file filtering

    * only run `yamllint` when relevant files have changed
    * avoids having to exclude files/dirs not tracked by Git
      e.g. .kitchen/, .bundle/ etc.
    * avoids a `yamllint` bug whereby pillar files under `test/`
      were not checked due to a conflicting `ignore` entry
    dafyddj committed Nov 9, 2023
    Copy the full SHA
    46130c4 View commit details

Commits on Nov 10, 2023

  1. Merge pull request #260 from dafyddj/test/pre-commit

    test(pre-commit): switch to using `pre-commit`'s built-in file filtering
    dafyddj authored Nov 10, 2023
    Copy the full SHA
    02167e2 View commit details

Commits on Nov 13, 2023

  1. chore(release): 5.0.10 [skip ci]

    ## [5.0.10](v5.0.9...v5.0.10) (2023-11-13)
    
    ### Bug Fixes
    
    * broken install-hooks due to saltlint v0.8.0 ([7da11c9](7da11c9))
    
    ### Continuous Integration
    
    * update the container images and refactor steps ([b84343e](b84343e))
    * **commitlint:** update action versions ([c69928d](c69928d))
    * update `pre-commit` configuration inc. for pre-commit.ci [skip ci] ([32518b9](32518b9))
    * **gitlab-ci:** fix test conversion job (reset back to [#249](#249)) [skip ci] ([6ea1cc2](6ea1cc2))
    
    ### Styles
    
    * **default.sls:** fix minor typo ([3d1581e](3d1581e))
    * **inspec:** fix whitespace ([1df9861](1df9861))
    
    ### Tests
    
    * **_mapdata:** add verification file for `ubuntu-22` [skip ci] ([9349c83](9349c83))
    * **pre-commit:** switch to using `pre-commit`'s built-in file filtering ([46130c4](46130c4))
    * **pre-commit:** update `pre-commit` hooks ([2bd3ef9](2bd3ef9))
    * **rstcheck:** ignore Markdown-style links as false positives ([b2c28aa](b2c28aa))
    * **system.rb:** add support for `mac_os_x` [skip ci] ([d46507b](d46507b))
    semantic-release-bot committed Nov 13, 2023
    Copy the full SHA
    65735fe View commit details

Commits on Dec 4, 2023

  1. ci: update container images

    dafyddj committed Dec 4, 2023
    Copy the full SHA
    963522f View commit details
  2. Merge pull request #262 from dafyddj/ci/container-images

    ci: update container images
    dafyddj authored Dec 4, 2023
    Copy the full SHA
    2eada5a View commit details
  3. test(rubocop): switch to using pre-commit's built-in file filtering

    * only run `rubocop` when relevant files have changed
    dafyddj committed Dec 4, 2023
    Copy the full SHA
    c3b4c14 View commit details
  4. Copy the full SHA
    9261a27 View commit details
  5. Merge pull request #261 from dafyddj/test/pc-rubocop

    test(rubocop): switch to using pre-commit's built-in file filtering
    dafyddj authored Dec 4, 2023
    Copy the full SHA
    9720832 View commit details
  6. chore(release): 5.0.11 [skip ci]

    ## [5.0.11](v5.0.10...v5.0.11) (2023-12-04)
    
    ### Continuous Integration
    
    * update container images ([963522f](963522f))
    
    ### Tests
    
    * **rubocop:** switch to using `pre-commit`'s built-in file filtering ([c3b4c14](c3b4c14))
    * **rubocop:** use `AllowedMethods` not deprecated `IgnoredMethods` ([9261a27](9261a27))
    semantic-release-bot committed Dec 4, 2023
    Copy the full SHA
    d4c5ee3 View commit details

Commits on Dec 31, 2023

  1. fix(suse): correct OS grain

    SUSE based distributions report the "os" grain as "SUSE".
    Only "os_family" is reported as "Suse".
    
    Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
    tacerus committed Dec 31, 2023
    Copy the full SHA
    6aee580 View commit details

Commits on Jan 2, 2024

  1. Merge pull request #263 from tacerus/suse

    fix(suse): correct OS grain
    baby-gnu authored Jan 2, 2024
    Copy the full SHA
    b2260b4 View commit details
  2. chore(release): 5.0.12 [skip ci]

    ## [5.0.12](v5.0.11...v5.0.12) (2024-01-02)
    
    ### Bug Fixes
    
    * **suse:** correct OS grain ([6aee580](6aee580))
    semantic-release-bot committed Jan 2, 2024
    Copy the full SHA
    fd8430b View commit details
Showing with 1,259 additions and 636 deletions.
  1. +2 −6 .github/workflows/commitlint.yml
  2. +65 −84 .gitlab-ci.yml
  3. +44 −16 .pre-commit-config.yaml
  4. +3 −1 .rstcheck.cfg
  5. +1 −1 .rubocop.yml
  6. +32 −47 .travis.yml
  7. +0 −27 .yamllint
  8. +8 −7 AUTHORS.md
  9. +64 −0 CHANGELOG.md
  10. +2 −2 FORMULA
  11. +4 −1 Gemfile
  12. +271 −218 Gemfile.lock
  13. +2 −2 bin/kitchen
  14. +16 −13 docs/AUTHORS.rst
  15. +77 −0 docs/CHANGELOG.rst
  16. +126 −203 kitchen.yml
  17. +4 −4 test/integration/default/controls/config.rb
  18. +3 −3 test/integration/default/controls/subcomponent_config.rb
  19. +44 −0 test/integration/default/files/_mapdata/almalinux-9.yaml
  20. +44 −0 test/integration/default/files/_mapdata/amazonlinux-2023.yaml
  21. +44 −0 test/integration/default/files/_mapdata/centos-9.yaml
  22. +44 −0 test/integration/default/files/_mapdata/debian-12.yaml
  23. +44 −0 test/integration/default/files/_mapdata/fedora-35.yaml
  24. +44 −0 test/integration/default/files/_mapdata/fedora-36.yaml
  25. +44 −0 test/integration/default/files/_mapdata/fedora-40.yaml
  26. +44 −0 test/integration/default/files/_mapdata/fedora-41.yaml
  27. +44 −0 test/integration/default/files/_mapdata/oraclelinux-9.yaml
  28. +44 −0 test/integration/default/files/_mapdata/rockylinux-9.yaml
  29. +44 −0 test/integration/default/files/_mapdata/ubuntu-22.yaml
  30. +44 −0 test/integration/default/files/_mapdata/ubuntu-24.yaml
  31. +1 −0 test/integration/default/inspec.yml
  32. +1 −0 test/integration/share/inspec.yml
  33. +4 −0 test/integration/share/libraries/system.rb
  34. +1 −1 test/salt/pillar/default.sls
8 changes: 2 additions & 6 deletions .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
@@ -7,10 +7,6 @@ name: Commitlint
jobs:
lint:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: wagoid/commitlint-github-action@v1
- uses: actions/checkout@v4
- uses: wagoid/commitlint-github-action@v5
149 changes: 65 additions & 84 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -13,12 +13,10 @@
stage_release: &stage_release 'release'
stage_test: &stage_test 'test'
# `image`
image_commitlint: &image_commitlint 'myii/ssf-commitlint:11'
image_dindruby: &image_dindruby 'myii/ssf-dind-ruby:2.7.1-r3'
image_dindrubybionic: &image_dindrubybionic 'myii/ssf-dind-ruby-bionic:2.7.5-1bbox1'
image_precommit: &image_precommit
name: 'myii/ssf-pre-commit:2.9.2'
entrypoint: ['/bin/bash', '-c']
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.76'
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.45'
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.45'
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.10'
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest'
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14'
# `services`
@@ -137,8 +135,10 @@ rubocop:
cache: *cache_bundler
before_script:
- 'export CONVERTED=test-the-use_this_template-button'
- 'git clone . tmp/"${CONVERTED}"-formula'
- 'cd tmp/"${CONVERTED}"-formula'
- 'git clone . /tmp/"${CONVERTED}"-formula'
- 'cd /tmp/"${CONVERTED}"-formula'
- 'git config user.email "test@example.com"'
- 'git config user.name "Test Name"'
# Install `pre-commit` hooks
- 'bin/install-hooks'
# Run the conversion script with debug output
@@ -149,9 +149,7 @@ rubocop:
# TODO: This should work from the env vars above automatically
- 'bundle config set path "${BUNDLE_CACHE_PATH}"'
- 'bundle config set without "${BUNDLE_WITHOUT}"'
- 'bundle update --bundler --conservative'
- 'bundle binstubs bundler --force'
- 'PATH=./bin:"$PATH" bundle install'
- 'bundle install'
script:
- 'bin/kitchen verify default-debian-11-master-py3'
# REMOVEME>
@@ -177,84 +175,67 @@ rubocop:
test-formula-conversion: {extends: '.test_conversion'}
# REMOVEME>
# 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'}
# default-ubuntu-2004-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-7-tiamat-py3: {extends: '.test_instance'}
# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
# default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
# default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
# default-almalinux-8-tiamat-py3: {extends: '.test_instance'}
# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
# Fedora 41+ will permit failure until this PR is merged into kitchen-docker
# https://github.com/test-kitchen/kitchen-docker/pull/427 is merged
# OpenSUSE master branch will fail until zypperpkg module is back in salt core
# https://github.com/saltstack/great-module-migration/issues/14
#
default-debian-12-master-py3: {extends: '.test_instance'}
default-debian-11-master-py3: {extends: '.test_instance'}
default-debian-10-master-py3: {extends: '.test_instance'}
default-debian-9-master-py3: {extends: '.test_instance'}
default-ubuntu-2404-master-py3: {extends: '.test_instance'}
default-ubuntu-2204-master-py3: {extends: '.test_instance'}
default-ubuntu-2004-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-7-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'}
default-amazonlinux-2-master-py3: {extends: '.test_instance'}
default-centos-stream9-master-py3: {extends: '.test_instance'}
default-opensuse-leap-156-master-py3: {extends: '.test_instance_failure_permitted'}
default-opensuse-leap-155-master-py3: {extends: '.test_instance'}
default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
default-amazonlinux-2023-master-py3: {extends: '.test_instance'}
default-fedora-41-master-py3: {extends: '.test_instance_failure_permitted'}
default-fedora-40-master-py3: {extends: '.test_instance'}
default-oraclelinux-9-master-py3: {extends: '.test_instance'}
default-oraclelinux-8-master-py3: {extends: '.test_instance'}
default-oraclelinux-7-master-py3: {extends: '.test_instance'}
default-arch-base-latest-master-py3: {extends: '.test_instance'}
default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
default-almalinux-9-master-py3: {extends: '.test_instance'}
default-almalinux-8-master-py3: {extends: '.test_instance'}
default-rockylinux-9-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-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-12-3007-1-py3: {extends: '.test_instance'}
default-debian-11-3007-1-py3: {extends: '.test_instance'}
default-ubuntu-2404-3007-1-py3: {extends: '.test_instance'}
default-ubuntu-2204-3007-1-py3: {extends: '.test_instance'}
default-ubuntu-2004-3007-1-py3: {extends: '.test_instance'}
default-centos-stream9-3007-1-py3: {extends: '.test_instance'}
default-opensuse-leap-156-3007-1-py3: {extends: '.test_instance'}
default-opensuse-leap-155-3007-1-py3: {extends: '.test_instance'}
default-opensuse-tmbl-latest-3007-1-py3: {extends: '.test_instance'}
default-fedora-41-3007-1-py3: {extends: '.test_instance_failure_permitted'}
default-fedora-40-3007-1-py3: {extends: '.test_instance'}
default-amazonlinux-2-3007-1-py3: {extends: '.test_instance_failure_permitted'}
default-amazonlinux-2023-3007-1-py3: {extends: '.test_instance'}
default-oraclelinux-9-3007-1-py3: {extends: '.test_instance'}
default-oraclelinux-8-3007-1-py3: {extends: '.test_instance'}
default-almalinux-9-3007-1-py3: {extends: '.test_instance'}
default-almalinux-8-3007-1-py3: {extends: '.test_instance'}
default-rockylinux-9-3007-1-py3: {extends: '.test_instance'}
default-rockylinux-8-3007-1-py3: {extends: '.test_instance'}
default-debian-12-3006-10-py3: {extends: '.test_instance'}
default-debian-11-3006-10-py3: {extends: '.test_instance'}
default-ubuntu-2404-3006-10-py3: {extends: '.test_instance'}
default-ubuntu-2204-3006-10-py3: {extends: '.test_instance'}
default-ubuntu-2004-3006-10-py3: {extends: '.test_instance'}
default-centos-stream9-3006-10-py3: {extends: '.test_instance'}
default-opensuse-leap-156-3006-10-py3: {extends: '.test_instance'}
default-opensuse-leap-155-3006-10-py3: {extends: '.test_instance'}
default-opensuse-tmbl-latest-3006-10-py3: {extends: '.test_instance'}
default-fedora-41-3006-10-py3: {extends: '.test_instance_failure_permitted'}
default-fedora-40-3006-10-py3: {extends: '.test_instance'}
default-amazonlinux-2-3006-10-py3: {extends: '.test_instance_failure_permitted'}
default-amazonlinux-2023-3006-10-py3: {extends: '.test_instance'}
default-oraclelinux-9-3006-10-py3: {extends: '.test_instance'}
default-oraclelinux-8-3006-10-py3: {extends: '.test_instance'}
default-almalinux-9-3006-10-py3: {extends: '.test_instance'}
default-almalinux-8-3006-10-py3: {extends: '.test_instance'}
default-rockylinux-9-3006-10-py3: {extends: '.test_instance'}
default-rockylinux-8-3006-10-py3: {extends: '.test_instance'}
# yamllint enable rule:line-length

###############################################################################
60 changes: 44 additions & 16 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -3,6 +3,18 @@
---
# See https://pre-commit.com for more information
# 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]
repos:
- repo: https://github.com/dafyddj/commitlint-pre-commit-hook
@@ -12,46 +24,62 @@ repos:
name: Check commit message using commitlint
description: Lint commit message against @commitlint/config-conventional rules
stages: [commit-msg]
additional_dependencies: ['@commitlint/config-conventional@8.3.4']
- id: commitlint-travis
stages: [manual]
additional_dependencies: ['@commitlint/config-conventional@8.3.4']
always_run: true
additional_dependencies: ['@commitlint/config-conventional@17.1.0']
- repo: https://github.com/rubocop-hq/rubocop
rev: v1.25.1
rev: v1.57.0
hooks:
- id: rubocop
name: Check Ruby files with rubocop
args: [--debug]
always_run: true
pass_filenames: false
- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.8.0.4
rev: v0.9.0.6
hooks:
- id: shellcheck
name: Check shell scripts with shellcheck
files: ^.*\.(sh|bash|ksh)$
types: []
- repo: https://github.com/adrienverge/yamllint
rev: v1.26.3
rev: v1.32.0
hooks:
- id: yamllint
name: Check YAML syntax with yamllint
args: [--strict, '.']
always_run: true
pass_filenames: false
args: [--strict]
types: [file]
# Files to include
# 1. Obvious YAML files
# 2. `pillar.example` and similar files
# 3. SLS files under directory `test/` which are pillar files
# Files to exclude
# 1. SLS files under directory `test/` which are state files
# 2. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
# 3. YAML files heavily reliant on Jinja
files: |
(?x)^(
.*\.yaml|
.*\.yml|
\.salt-lint|
\.yamllint|
.*\.example|
test/.*\.sls
)$
exclude: |
(?x)^(
kitchen.vagrant.yml|
test/.*/states/.*\.sls
)$
- repo: https://github.com/warpnet/salt-lint
rev: v0.8.0
rev: v0.9.2
hooks:
- id: salt-lint
name: Check Salt files using salt-lint
files: ^.*\.(sls|jinja|j2|tmpl|tst)$
- repo: https://github.com/myint/rstcheck
rev: 3f929574
rev: v6.2.0
hooks:
- id: rstcheck
name: Check reST files using rstcheck
exclude: 'docs/CHANGELOG.rst'
additional_dependencies: [sphinx==7.2.6]
- repo: https://github.com/saltstack-formulas/mirrors-rst-lint
rev: v1.3.2
hooks:
@@ -64,4 +92,4 @@ repos:
docs/CONTRIBUTING_DOCS.rst|
docs/index.rst|
)$
additional_dependencies: [pygments==2.9.0]
additional_dependencies: [pygments==2.16.1]
4 changes: 3 additions & 1 deletion .rstcheck.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
[rstcheck]
report=info
ignore_language=rst
ignore_messages=(Duplicate (ex|im)plicit target.*|Hyperlink target ".*" is not referenced\.$)
# salt['config.get']('roles') is misidentified as a Markdown link.
# Ignore for now, but perhaps try to submit a fix upstream in rstcheck
ignore_messages=(Duplicate (ex|im)plicit target.*|Hyperlink target ".*" is not referenced\.$|\(rst\) Link is formatted in Markdown style\.)
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ Layout/LineLength:
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
Max: 88
Metrics/BlockLength:
IgnoredMethods:
AllowedMethods:
- control
- describe
# Increase from default of `25`
Loading