Both collections are required for now.

This commit is contained in:
Robert de Bock 2022-01-25 01:54:09 +01:00
parent 2f48d692ee
commit 9b24b14981
5 changed files with 7 additions and 9 deletions

View file

@ -22,7 +22,7 @@ jobs:
with:
path: "${{ github.repository }}"
- name: molecule
uses: robertdebock/molecule-action@2.7.2
uses: robertdebock/molecule-action@master
with:
command: lint
test:
@ -63,7 +63,7 @@ jobs:
- name: parse apparmor for mysql
run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
- name: molecule
uses: robertdebock/molecule-action@2.7.2
uses: robertdebock/molecule-action@master
with:
image: ${{ matrix.config.image }}
tag: ${{ matrix.config.tag }}

View file

@ -1,5 +1,5 @@
---
image: "robertdebock/github-action-molecule:3.3.1"
image: "robertdebock/github-action-molecule"
services:
- docker:dind
@ -10,6 +10,7 @@ variables:
molecule:
script:
- test -f requirements.yml && ansible-galaxy install -r requirements.yml
- image=${image} tag=${tag} molecule test
rules:
- if: $CI_COMMIT_REF_NAME == "master"

View file

@ -1,4 +0,0 @@
---
collections:
- name: community.docker
- name: community.general

View file

@ -6,6 +6,7 @@ dependency:
name: galaxy
options:
role-file: requirements.yml
requirements-file: requirements.yml
lint: |
set -e
yamllint .

View file

@ -3,15 +3,15 @@
#
[tox]
minversion = 3.21.4
envlist = py{39}-ansible-{2.9,2.10,2.11}
envlist = py{310}-ansible-{2.10,2.11,2.12}
skipsdist = true
[testenv]
deps =
2.9: ansible == 2.9.*
2.10: ansible-base == 2.10.*
2.11: ansible-core == 2.11.*
2.12: ansible-core == 2.12.*
molecule[docker]
docker == 4.*
ansible-lint == 5.*