Add ability to detect molecule base.yml configs (#1374)

Fixes: #1369
ansible · Feb 18, 2021 · 3cad55f · 3cad55f
1 parent 384b863
commit 3cad55f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/ansiblelint/config.py b/src/ansiblelint/config.py
@@ -26,7 +26,7 @@
     {
         "requirements": "**/molecule/*/collections.{yaml,yml}"
     },  # molecule old collection requirements (v1), ansible 2.8 only
-    {"yaml": "**/molecule/*/molecule.{yaml,yml}"},  # molecule config
+    {"yaml": "**/molecule/*/{base,molecule}.{yaml,yml}"},  # molecule config
     {"playbook": "**/molecule/*/*.{yaml,yml}"},  # molecule playbooks
     {"yaml": "**/*.{yaml,yml}"},
     {"yaml": "**/.*.{yaml,yml}"},

diff --git a/test/TestUtils.py b/test/TestUtils.py
@@ -340,6 +340,7 @@ def test_is_playbook():
         ("playbooks/roles/foo.yml", "yaml"),
         # the only yml file that is not a playbook inside molecule/ folders
         (".config/molecule/config.yml", "yaml"),  # molecule shared config
+        ("roles/foo/molecule/scen1/base.yml", "yaml"),  # molecule scenario base config
         ("roles/foo/molecule/scen1/molecule.yml", "yaml"),  # molecule scenario config
         ("roles/foo/molecule/scen2/foobar.yml", "playbook"),  # custom playbook name
         ("roles/foo/molecule/scen3/converge.yml", "playbook"),  # common playbook name