Skip to content

Commit

Permalink
Classify meta/main.y(a)ml from ansible-test integration tests as 'tes…
Browse files Browse the repository at this point in the history
…t-meta' and not 'meta'. (#2156)

Co-authored-by: Sorin Sbarnea <ssbarnea@redhat.com>
  • Loading branch information
felixfontein and ssbarnea committed May 18, 2022
1 parent d1ee17a commit 679ffc0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/ansiblelint/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
{"tasks": "**/tasks/**/*.{yaml,yml}"},
{"handlers": "**/handlers/*.{yaml,yml}"},
{"vars": "**/{host_vars,group_vars,vars,defaults}/**/*.{yaml,yml}"},
{"test-meta": "**/tests/integration/targets/*/meta/main.{yaml,yml}"},
{"meta": "**/meta/main.{yaml,yml}"},
{"meta-runtime": "**/meta/runtime.{yaml,yml}"},
{"arg_specs": "**/roles/**/meta/argument_specs.{yaml,yml}"}, # role argument specs
Expand Down
2 changes: 1 addition & 1 deletion src/ansiblelint/skip_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def _append_skipped_rules(
# parse file text using 2nd parser library
ruamel_data = load_data(lintable.content)

if lintable.kind in ["yaml", "requirements", "vars", "meta", "reno"]:
if lintable.kind in ["yaml", "requirements", "vars", "meta", "reno", "test-meta"]:
pyyaml_data[0]["skipped_rules"] = _get_rule_skips_from_yaml(ruamel_data)
return pyyaml_data

Expand Down
2 changes: 1 addition & 1 deletion src/ansiblelint/yaml_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ def get_path_to_task(
if lintable.kind == "playbook":
assert isinstance(ruamel_data, CommentedSeq)
return _get_path_to_task_in_playbook(line_number, ruamel_data)
# if lintable.kind in ["yaml", "requirements", "vars", "meta", "reno"]:
# if lintable.kind in ["yaml", "requirements", "vars", "meta", "reno", "test-meta"]:

return []

Expand Down

0 comments on commit 679ffc0

Please sign in to comment.