Skip to content

Commit 1c567f5

Browse files
committed
Use molecule 3
1 parent 676f187 commit 1c567f5

6 files changed

Lines changed: 17 additions & 18 deletions

File tree

.github/workflows/ansible.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- '*'
1212
pull_request:
1313
schedule:
14-
- cron: '17 15 5 * *'
14+
- cron: '3 1 5 * *'
1515

1616
jobs:
1717
lint:
@@ -20,7 +20,7 @@ jobs:
2020
- name: checkout
2121
uses: actions/checkout@v2
2222
- name: molecule
23-
uses: robertdebock/molecule-action@1.2.8
23+
uses: robertdebock/molecule-action@2.0.0
2424
with:
2525
entrypoint: /usr/local/bin/molecule
2626
args: lint
@@ -50,7 +50,7 @@ jobs:
5050
- name: parse apparmor for mysql
5151
run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
5252
- name: molecule
53-
uses: robertdebock/molecule-action@1.2.8
53+
uses: robertdebock/molecule-action@2.0.0
5454
with:
5555
image: ${{ matrix.config.image }}
5656
tag: ${{ matrix.config.tag }}

.github/workflows/galaxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
tags:
1111
- '*'
1212
schedule:
13-
- cron: '54 4 6 * *'
13+
- cron: '28 14 6 * *'
1414

1515
jobs:
1616
release:

.yamllint

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
extends: default
23

34
rules:

README.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
epel
22
=========
33

4-
<img src="https://docs.ansible.com/ansible-tower/3.2.4/html_ja/installandreference/_static/images/logo_invert.png" width="10%" height="10%" alt="Ansible logo" align="right"/>
5-
<a href="https://travis-ci.org/robertdebock/ansible-role-epel"> <img src="https://travis-ci.org/robertdebock/ansible-role-epel.svg?branch=master" alt="Build status"/></a> <img src="https://img.shields.io/ansible/role/d/21643"/> <img src="https://img.shields.io/ansible/quality/21643"/>
6-
7-
<a href="https://github.com/robertdebock/ansible-role-epel/actions"><img src="https://github.com/robertdebock/ansible-role-epel/workflows/GitHub%20Action/badge.svg"/></a>
8-
94
Install epel on your system.
105

6+
|Travis|GitHub|Quality|Downloads|
7+
|------|------|-------|---------|
8+
|[![travis](https://travis-ci.org/robertdebock/ansible-role-epel.svg?branch=master)](https://travis-ci.org/robertdebock/ansible-role-epel)|[![github](https://github.com/robertdebock/ansible-role-epel/workflows/Ansible%20Molecule/badge.svg)](https://github.com/robertdebock/ansible-role-epel/actions)|![quality](https://img.shields.io/ansible/quality/21643)|![downloads](https://img.shields.io/ansible/role/d/21643)|
9+
1110
Example Playbook
1211
----------------
1312

14-
This example is taken from `molecule/resources/playbook.yml` and is tested on each push, pull request and release.
13+
This example is taken from `molecule/resources/converge.yml` and is tested on each push, pull request and release.
1514
```yaml
1615
---
1716
- name: Converge
@@ -23,7 +22,7 @@ This example is taken from `molecule/resources/playbook.yml` and is tested on ea
2322
- robertdebock.epel
2423
```
2524
26-
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.
25+
The machine may need to be prepared using `molecule/resources/prepare.yml`:
2726
```yaml
2827
---
2928
- name: Prepare
@@ -35,7 +34,7 @@ The machine you are running this on, may need to be prepared, I use this playboo
3534
- robertdebock.bootstrap
3635
```
3736

38-
After running this role, this playbook runs to verify that everything works, this may be a good example how you can use this role.
37+
For verification `molecule/resources/verify.yml` run after the role has been applied.
3938
```yaml
4039
---
4140
- name: Verify

molecule/default/molecule.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ dependency:
66
name: galaxy
77
options:
88
role-file: requirements.yml
9-
lint:
10-
name: yamllint
9+
lint: |
10+
yamllint molecule/default/converge.yml
11+
ansible-lint molecule/default/converge.yml
1112
driver:
1213
name: docker
1314
platforms:
@@ -26,8 +27,5 @@ provisioner:
2627
bin_ansible_callbacks: yes
2728
verifier:
2829
name: ansible
29-
lint:
30-
name: ansible-lint
31-
enabled: yes
3230
scenario:
3331
name: default

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ deps =
1111
previous: ansible>=2.8, <2.9
1212
current: ansible>=2.9
1313
next: git+https://github.com/ansible/ansible.git@devel
14+
molecule>=3, <4
1415
docker
15-
molecule
16+
ansible-lint
1617
commands = molecule test
1718
setenv =
1819
TOX_ENVNAME={envname}

0 commit comments

Comments
 (0)