diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml
index 2ce60c2..63f94da 100644
--- a/.github/workflows/ansible.yml
+++ b/.github/workflows/ansible.yml
@@ -11,7 +11,7 @@ on:
- '*'
pull_request:
schedule:
- - cron: '24 9 8 * *'
+ - cron: '58 15 8 * *'
jobs:
lint:
@@ -20,7 +20,7 @@ jobs:
- name: checkout
uses: actions/checkout@v2
- name: molecule
- uses: robertdebock/molecule-action@1.2.8
+ uses: robertdebock/molecule-action@2.0.0
with:
entrypoint: /usr/local/bin/molecule
args: lint
@@ -34,6 +34,8 @@ jobs:
config:
- image: "debian"
tag: "latest"
+ - image: "debian"
+ tag: "testing"
- image: "debian"
tag: "unstable"
- image: "centos"
@@ -60,7 +62,7 @@ jobs:
- name: parse apparmor for mysql
run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
- name: molecule
- uses: robertdebock/molecule-action@1.2.8
+ uses: robertdebock/molecule-action@2.0.0
with:
image: ${{ matrix.config.image }}
tag: ${{ matrix.config.tag }}
diff --git a/.github/workflows/galaxy.yml b/.github/workflows/galaxy.yml
index 5198af0..3a65c43 100644
--- a/.github/workflows/galaxy.yml
+++ b/.github/workflows/galaxy.yml
@@ -10,7 +10,7 @@ on:
tags:
- '*'
schedule:
- - cron: '0 1 9 * *'
+ - cron: '26 5 9 * *'
jobs:
release:
diff --git a/.travis.yml b/.travis.yml
index 3a741de..60651ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ env:
namespace="robertdebock"
matrix:
- image="debian" tag="latest"
+ - image="debian" tag="testing"
- image="debian" tag="unstable"
- image="centos" tag="7"
- image="centos" tag="latest"
diff --git a/.yamllint b/.yamllint
index ad0be76..c5ae64b 100644
--- a/.yamllint
+++ b/.yamllint
@@ -1,3 +1,4 @@
+---
extends: default
rules:
diff --git a/README.md b/README.md
index 0b99b6d..8635503 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,16 @@
httpd
=========
-
-
-
-
-
Install and configure httpd on your system.
+|Travis|GitHub|Quality|Downloads|
+|------|------|-------|---------|
+|[![travis](https://travis-ci.org/robertdebock/ansible-role-httpd.svg?branch=master)](https://travis-ci.org/robertdebock/ansible-role-httpd)|[![github](https://github.com/robertdebock/ansible-role-httpd/workflows/Ansible%20Molecule/badge.svg)](https://github.com/robertdebock/ansible-role-httpd/actions)|![quality](https://img.shields.io/ansible/quality/21855)|![downloads](https://img.shields.io/ansible/role/d/21855)|
+
Example Playbook
----------------
-This example is taken from `molecule/resources/playbook.yml` and is tested on each push, pull request and release.
+This example is taken from `molecule/resources/converge.yml` and is tested on each push, pull request and release.
```yaml
---
- name: Converge
@@ -55,7 +54,7 @@ This example is taken from `molecule/resources/playbook.yml` and is tested on ea
- robertdebock.httpd
```
-The machine you are running this on, may need to be prepared, I use this playbook to ensure everything is in place to let the role work.
+The machine may need to be prepared using `molecule/resources/prepare.yml`:
```yaml
---
- name: Prepare
@@ -70,7 +69,7 @@ The machine you are running this on, may need to be prepared, I use this playboo
- robertdebock.python_pip
```
-After running this role, this playbook runs to verify that everything works, this may be a good example how you can use this role.
+For verification `molecule/resources/verify.yml` run after the role has been applied.
```yaml
---
- name: Verify
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 6acb926..0379043 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -6,8 +6,9 @@ dependency:
name: galaxy
options:
role-file: requirements.yml
-lint:
- name: yamllint
+lint: |
+ yamllint molecule/default/converge.yml
+ ansible-lint molecule/default/converge.yml
driver:
name: docker
platforms:
@@ -26,8 +27,5 @@ provisioner:
bin_ansible_callbacks: yes
verifier:
name: ansible
- lint:
- name: ansible-lint
- enabled: yes
scenario:
name: default
diff --git a/tox.ini b/tox.ini
index 538e992..e814b4c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,8 +11,9 @@ deps =
previous: ansible>=2.8, <2.9
current: ansible>=2.9
next: git+https://github.com/ansible/ansible.git@devel
+ molecule>=3, <4
docker
- molecule
+ ansible-lint
commands = molecule test
setenv =
TOX_ENVNAME={envname}