Fixes #186: Update tests to use Molecule 3.0 and lint manually.

geerlingguy · Feb 20, 2020 · 77f3911 · 77f3911
1 parent 199a138
commit 77f3911
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ env:
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.

diff --git a/molecule/default/yaml-lint.yml → .yamllint b/molecule/default/yaml-lint.yml → .yamllint
diff --git a/molecule/default/playbook.yml → molecule/default/converge.yml b/molecule/default/playbook.yml → molecule/default/converge.yml
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -3,10 +3,9 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +16,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}