Update molecule configuration to work with 3.0.

supertarto · Feb 25, 2020 · 68f3644 · 68f3644
1 parent ea0b07c
commit 68f3644
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 65 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,10 +7,9 @@ env:
     - ROLE_NAME: glpi
   matrix:
     - MOLECULE_DISTRIB: debian10:latest
-      MOLECULE_PLAYBOOK: debian10-playbook.yml
 
 install:
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   - cd ../

diff --git a/molecule/default/yaml-lint.yml → .yamllint b/molecule/default/yaml-lint.yml → .yamllint
@@ -2,5 +2,5 @@
 extends: default
 rules:
   line-length:
-    max: 255
+    max: 160
     level: warning
diff --git a/molecule/default/Dockerfile.j2 b/molecule/default/Dockerfile.j2
diff --git a/molecule/default/INSTALL.rst b/molecule/default/INSTALL.rst
diff --git a/molecule/default/debian10-playbook.yml → molecule/default/converge.yml b/molecule/default/debian10-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: "thetarto/ansible-${MOLECULE_DISTRIB}"
@@ -17,11 +16,3 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
-  playbooks:
-    converge: ${MOLECULE_PLAYBOOK}
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py