From 7038f1557276b2d500908202d8cf51300c29c3c0 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 7 Oct 2019 14:55:51 +0100 Subject: [PATCH] feat(yamllint): add `.kitchen/` directory to paths to be ignored * YAML files are copied there during local Kitchen testing --- ssf/defaults.yaml | 1 + ssf/files/default/.yamllint | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index 37808dd8..21c87e21 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -176,6 +176,7 @@ ssf_node_anchors: - 'node_modules/' additional_ssf: - 'test/**/states/**/*.sls' + - '.kitchen/' additional: [] yaml-files: default: diff --git a/ssf/files/default/.yamllint b/ssf/files/default/.yamllint index f2fb8d48..68ce8411 100644 --- a/ssf/files/default/.yamllint +++ b/ssf/files/default/.yamllint @@ -17,13 +17,14 @@ extends: {{ yamllint.extends }} # Files to ignore completely # 1. All YAML files under directory `node_modules/`, introduced during the Travis run # 2. Any SLS files under directory `test/`, which are actually state files +# 3. Any YAML files under directory `.kitchen/`, introduced during local testing {%- if semrel_formula == 'ssf' %} -# 3. All Jinja templates under `ssf/files/` (result in `yamllint` syntax errors) +# 4. 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' %} -# 3. Any YAML files using Jinja (result in `yamllint` syntax errors) +# 4. Any YAML files using Jinja (result in `yamllint` syntax errors) {%- elif semrel_formula in ['postgres', 'salt'] %} -# 3. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR +# 4. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR {%- endif %} {%- set yl_ignores = {'ignore': yamllint.ignore.default +