Skip to content

Commit 5890b8a

Browse files
myiimyii
committed
fix(salt-lint): fix errors
```bash Examining ssf/libcimatrix.jinja of type state [204] Lines should be no longer that 160 chars ssf/libcimatrix.jinja:4 {%- macro format_ci_matrix(platforms, inspec_suites_kitchen, inspec_suites_matrix, platforms_matrix, platforms_matrix_commented_includes, semrel_formula, width=4, use_new_travis_format=False ) %} [203] Most files should not contain tabs ssf/libcimatrix.jinja:28 {#- | # | inc | exc | result | #} [203] Most files should not contain tabs ssf/libcimatrix.jinja:30 {#- | 1 | y | [] | TRUE | #} [203] Most files should not contain tabs ssf/libcimatrix.jinja:31 {#- | 2 | y | n | TRUE | #} [203] Most files should not contain tabs ssf/libcimatrix.jinja:32 {#- | 3 | y | y | TRUE | #} [203] Most files should not contain tabs ssf/libcimatrix.jinja:33 {#- | 4 | [] | [] | TRUE | #} [203] Most files should not contain tabs ssf/libcimatrix.jinja:34 {#- | 5 | [] | n | TRUE | #} [203] Most files should not contain tabs ssf/libcimatrix.jinja:35 {#- | 6 | [] | y | FALSE | #} [203] Most files should not contain tabs ssf/libcimatrix.jinja:36 {#- | 7 | n | [] | FALSE | #} [203] Most files should not contain tabs ssf/libcimatrix.jinja:37 {#- | 8 | n | n | FALSE | #} [203] Most files should not contain tabs ssf/libcimatrix.jinja:38 {#- | 9 | n | y | FALSE | #} [206] Jinja variables should have spaces before and after: {{ var_name }} ssf/libcimatrix.jinja:70 {{ comment }}- {{instance_and_env }}{{ instance }} ... Examining ssf/map.jinja of type state [209] Jinja comment should have spaces before and after: {# comment #} ssf/map.jinja:10 {## Merge the formulas ##} ```
1 parent 2dac9b0 commit 5890b8a

File tree

2 files changed

+22
-13
lines changed

2 files changed

+22
-13
lines changed

‎ssf/libcimatrix.jinja‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
# -*- coding: utf-8 -*-
22
# vim: ft=jinja
33

4-
{%- macro format_ci_matrix(platforms, inspec_suites_kitchen, inspec_suites_matrix, platforms_matrix, platforms_matrix_commented_includes, semrel_formula, width=4, use_new_travis_format=False ) %}
4+
{%- macro format_ci_matrix(
5+
platforms,
6+
inspec_suites_kitchen,
7+
inspec_suites_matrix,
8+
platforms_matrix,
9+
platforms_matrix_commented_includes,
10+
semrel_formula,
11+
width=4,
12+
use_new_travis_format=False
13+
) %}
514
{%- filter indent(width) %}
615
{#- Centralise duplication from here and `kitchen.yml` #}
716
{%- set platform_and_suite_names_done = [] %}
@@ -25,17 +34,17 @@
2534
{%- do platform_and_suite_names_done.append(platform_and_suite_name) %}
2635
{#- Only continue depending on an appropriate combination of `includes` and `excludes`: #}
2736
{#- |---|-----|-----|--------| #}
28-
{#- | # | inc | exc | result | #}
37+
{#- | # | inc | exc | result | #}
2938
{#- |---|-----|-----|--------| #}
30-
{#- | 1 | y | [] | TRUE | #}
31-
{#- | 2 | y | n | TRUE | #}
32-
{#- | 3 | y | y | TRUE | #}
33-
{#- | 4 | [] | [] | TRUE | #}
34-
{#- | 5 | [] | n | TRUE | #}
35-
{#- | 6 | [] | y | FALSE | #}
36-
{#- | 7 | n | [] | FALSE | #}
37-
{#- | 8 | n | n | FALSE | #}
38-
{#- | 9 | n | y | FALSE | #}
39+
{#- | 1 | y | [] | TRUE | #}
40+
{#- | 2 | y | n | TRUE | #}
41+
{#- | 3 | y | y | TRUE | #}
42+
{#- | 4 | [] | [] | TRUE | #}
43+
{#- | 5 | [] | n | TRUE | #}
44+
{#- | 6 | [] | y | FALSE | #}
45+
{#- | 7 | n | [] | FALSE | #}
46+
{#- | 8 | n | n | FALSE | #}
47+
{#- | 9 | n | y | FALSE | #}
3948
{#- |---|-----|-----|--------| #}
4049
{%- if (platform in includes) or (not includes and platform not in excludes) %}
4150
{%- set include_instance = True %}
@@ -67,7 +76,7 @@
6776
salt_ver | replace('.', '-'),
6877
py_ver,
6978
) %}
70-
{{ comment }}- {{instance_and_env }}{{ instance }}
79+
{{ comment }}- {{ instance_and_env }}{{ instance }}
7180
{%- endif %}
7281
{%- endif %}
7382
{%- endif %}

‎ssf/map.jinja‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{%- import_yaml tplroot ~ "/defaults.yaml" as defaults %}
88
{%- import_yaml tplroot ~ "/formulas.yaml" as formulas %}
99

10-
{## Merge the formulas ##}
10+
{#- Merge the formulas #}
1111
{%- do salt['defaults.merge'](defaults, formulas) %}
1212

1313
{#- Merge the ssf config (e.g. from pillar) #}

0 commit comments

Comments
 (0)