From acc0b051ac5cbe1a02218f103de1b6f8fd48696b Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Mon, 5 Apr 2021 08:46:15 +0100
Subject: [PATCH] feat(kitchen-vagrant): update `CODEOWNERS` and `.yamllint`
 accordingly

---
 .yamllint                   | 8 +++-----
 ssf/defaults.yaml           | 7 +++++--
 ssf/files/default/.yamllint | 7 ++++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.yamllint b/.yamllint
index 94e9fd8c..d14cf8a2 100644
--- a/.yamllint
+++ b/.yamllint
@@ -10,7 +10,8 @@ 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/
@@ -18,6 +19,7 @@ ignore: |
   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
@@ -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
 
diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
index c68b72d2..683e69ca 100644
--- a/ssf/defaults.yaml
+++ b/ssf/defaults.yaml
@@ -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'
@@ -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'
@@ -233,6 +235,7 @@ ssf_node_anchors:
             additional_ssf:
               - 'test/**/states/**/*.sls'
               - '.kitchen/'
+              - 'kitchen.vagrant.yml'
             additional: []
           yaml-files:
             default:
diff --git a/ssf/files/default/.yamllint b/ssf/files/default/.yamllint
index 4a5bed38..1a6043c8 100644
--- a/ssf/files/default/.yamllint
+++ b/ssf/files/default/.yamllint
@@ -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 +