gitadmin
/
ansible-generator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prepare for Molecule 3.0.0

This commit is contained in:
Robert de Bock 2020-02-20 16:51:16 +01:00
parent 2083278949
commit 4835413dee
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/yamllint
View File

@ -9,6 +9,4 @@ rules:
max-spaces-inside: 1 max-spaces-inside: 1
level: error level: error
line-length: disable line-length: disable
# NOTE(retr0h): Templates no longer fail this lint rule.
# Uncomment if running old Molecule templates.
truthy: disable truthy: disable

4
templates/ansible.yml.j2
View File

@ -18,7 +18,7 @@ jobs:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: molecule - name: molecule
uses: robertdebock/molecule-action@1.2.8 uses: robertdebock/molecule-action@2.0.0
with: with:
entrypoint: /usr/local/bin/molecule entrypoint: /usr/local/bin/molecule
args: lint args: lint
@ -49,7 +49,7 @@ jobs:
- name: parse apparmor for mysql - name: parse apparmor for mysql
run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
- name: molecule - name: molecule
uses: robertdebock/molecule-action@1.2.8 uses: robertdebock/molecule-action@2.0.0
with: with:
image: {% raw %}${{ matrix.config.image }}{% endraw %} image: {% raw %}${{ matrix.config.image }}{% endraw %}

8
templates/molecule.yml.j2
View File

@ -4,8 +4,9 @@ dependency:
name: galaxy name: galaxy
options: options:
role-file: requirements.yml role-file: requirements.yml
lint: lint: |
name: yamllint yamllint .
ansible-lint .
driver: driver:
name: docker name: docker
platforms: platforms:
@ -25,9 +26,6 @@ provisioner:
{% if verify.stat.exists %} {% if verify.stat.exists %}
verifier: verifier:
name: ansible name: ansible
lint:
name: ansible-lint
enabled: yes
{% endif %} {% endif %}
scenario: scenario:
name: default name: default