Updates for molecule 3.0

elnappo · Apr 13, 2020 · 8626b02 · 8626b02
1 parent 92b9e0d
commit 8626b02
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ env:
 
 install:
  - sudo modprobe ip6_tables
- - pip install molecule docker
+ - pip install molecule yamllint ansible-lint flake8 docker pytest testinfra
 
 script:
  - molecule test

diff --git a/.yamllint b/.yamllint
@@ -1,3 +1,4 @@
+---
 extends: default
 
 rules:

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,8 +3,11 @@ dependency:
  name: galaxy
 driver:
  name: docker
-lint:
- name: yamllint
+lint: |
+ set -e
+ yamllint .
+ ansible-lint
+ flake8
 platforms:
  - name: instance
  image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
@@ -17,11 +20,5 @@ provisioner:
  name: ansible
  playbooks:
  prepare: prepare.yml
- lint:
- name: ansible-lint
-scenario:
- name: default
 verifier:
  name: testinfra
- lint:
- name: flake8
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
@@ -23,6 +23,8 @@
  update_cache: true
  state: latest
  when: ansible_os_family == 'RedHat'
+ tags:
+ - skip_ansible_lint
 
  - name: Install dependencies
  package: