Merge pull request #160 from lemberg/feature/159-molecule-3

Upgrade tests: Molecule 2 => 3
lemberg · Mar 2, 2020 · f62fde4 · f62fde4
2 parents 73c3837 + 1b7f8b0
commit f62fde4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -124,7 +124,7 @@ jobs:
 
       install:
         - composer install --no-interaction --no-progress --no-suggest --prefer-dist --optimize-autoloader --no-dev
-        - pip install ansible==2.9.* docker molecule
+        - pip install ansible==2.9.* ansible-lint docker flake8 molecule==3.*
 
       script:
         - molecule test

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
@@ -5,11 +5,11 @@ dependency:
     role-file: provisioning/requirements.yml
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-data:
-      ignore: vendor/
+lint: |
+  set -e
+  yamllint --config-data "{ignore: vendor/}" .
+  ansible-lint
+  flake8
 platforms:
   - name: draft
     image: "geerlingguy/docker-${MOLECULE_PLATFORM}-ansible:latest"
@@ -22,5 +22,3 @@ provisioner:
   config_options:
     ssh_connection:
       pipelining: true
-  lint:
-    name: ansible-lint