Skip to content

Commit

Permalink
feat(kitchen-vagrant): update CODEOWNERS and .yamllint accordingly
Browse files Browse the repository at this point in the history
  • Loading branch information
myii committed Apr 5, 2021
1 parent a89e1d9 commit acc0b05
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
8 changes: 3 additions & 5 deletions .yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@ extends: 'default'
# 3. All YAML files under directory `node_modules/`, introduced during the Travis run
# 4. Any SLS files under directory `test/`, which are actually state files
# 5. Any YAML files under directory `.kitchen/`, introduced during local testing
# 6. All Jinja templates under `ssf/files/` (result in `yamllint` syntax errors)
# 6. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
# 7. All Jinja templates under `ssf/files/` (result in `yamllint` syntax errors)
# Not disabling via. `*.yml` since we may end up with non-Jinja YAML files here
ignore: |
.cache/
.git/
node_modules/
test/**/states/**/*.sls
.kitchen/
kitchen.vagrant.yml
ssf/files/default/.cirrus.yml
ssf/files/default/.gitlab-ci.yml
ssf/files/default/.pre-commit-config.yaml
Expand All @@ -27,11 +29,7 @@ ignore: |
ssf/files/default/.yamllint
ssf/files/default/inspec/inspec.yml
ssf/files/default/kitchen.yml
ssf/files/default/kitchen.vagrant.yml
ssf/files/default/kitchen.windows.yml
ssf/files/default/.github/workflows/kitchen.yml
ssf/files/default/.github/workflows/kitchen.vagrant.yml
ssf/files/default/.github/workflows/kitchen.windows.yml
ssf/files/tofs_arvados-formula/.travis.yml
ssf/files/tofs_ssf-formula/.yamllint
Expand Down
7 changes: 5 additions & 2 deletions ssf/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ ssf_node_anchors:
- '/Gemfile': '@saltstack-formulas/ssf'
- '/Gemfile.lock': '@saltstack-formulas/ssf'
- '/kitchen.yml': '@saltstack-formulas/ssf'
- '/kitchen.vagrant.yml': '@saltstack-formulas/ssf'
- '/kitchen.windows.yml': '@saltstack-formulas/ssf'
- '/pre-commit_semantic-release.sh': '@saltstack-formulas/ssf'
- '/release-rules.js': '@saltstack-formulas/ssf'
- '/release.config.js': '@saltstack-formulas/ssf'
Expand All @@ -62,8 +64,8 @@ ssf_node_anchors:
# An alternative method could be to use:
# `git describe --abbrev=0 --tags`
# yamllint disable rule:line-length rule:quoted-strings
title: "ci: enable Vagrant-based testing using GitHub Actions"
body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/309'
title: "chore: update '`'CODEOWNERS'`' & '`'.yamllint'`' re: '`'kitchen-vagrant'`' [skip ci]"
body: '* Automated using https://github.com/myii/ssf-formula/pull/310'
# yamllint enable rule:line-length rule:quoted-strings
github:
owner: 'saltstack-formulas'
Expand Down Expand Up @@ -233,6 +235,7 @@ ssf_node_anchors:
additional_ssf:
- 'test/**/states/**/*.sls'
- '.kitchen/'
- 'kitchen.vagrant.yml'
additional: []
yaml-files:
default:
Expand Down
7 changes: 4 additions & 3 deletions ssf/files/default/.yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ extends: '{{ yamllint.extends }}'
# 3. All YAML files under directory `node_modules/`, introduced during the Travis run
# 4. Any SLS files under directory `test/`, which are actually state files
# 5. Any YAML files under directory `.kitchen/`, introduced during local testing
# 6. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
{%- if semrel_formula == 'ssf' %}
# 6. All Jinja templates under `ssf/files/` (result in `yamllint` syntax errors)
# 7. All Jinja templates under `ssf/files/` (result in `yamllint` syntax errors)
# Not disabling via. `*.yml` since we may end up with non-Jinja YAML files here
{%- elif semrel_formula == 'mysql' %}
# 6. Any YAML files using Jinja (result in `yamllint` syntax errors)
# 7. Any YAML files using Jinja (result in `yamllint` syntax errors)
{%- elif semrel_formula in ['postgres', 'salt'] %}
# 6. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
# 7. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
{%- endif %}
{%- set yl_ignores = {'ignore':
yamllint.ignore.default +
Expand Down

0 comments on commit acc0b05

Please sign in to comment.