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

Don't mention requirements-file, it breaks molecule.

This commit is contained in:
Robert de Bock 2021-05-14 09:47:59 +02:00
parent ca39790622
commit d5d9483637
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
templates/molecule.yml.j2
View File

@ -4,9 +4,6 @@ dependency:
name: galaxy name: galaxy
options: options:
role-file: requirements.yml role-file: requirements.yml
{% if requirements.collections is defined %}
requirements-file: requirements.yml
{% endif %}
lint: | lint: |
set -e set -e
yamllint . yamllint .
@ -23,10 +20,6 @@ platforms:
pre_build_image: yes pre_build_image: yes
provisioner: provisioner:
name: ansible name: ansible
config_options:
defaults:
stdout_callback: yaml
bin_ansible_callbacks: yes
{% if verify.stat.exists %} {% if verify.stat.exists %}
verifier: verifier:
name: ansible name: ansible

9
templates/tox.ini.j2
View File

@ -4,8 +4,7 @@ minversion = 3.21.4
{% if tox_versions is defined %} {% if tox_versions is defined %}
envlist = py{39}-ansible-{% raw %}{{% endraw %}{% for version in tox_versions %}{{ version }}{% if not loop.last %},{% endif %}{% endfor %}{% raw %}}{% endraw %} envlist = py{39}-ansible-{% raw %}{{% endraw %}{% for version in tox_versions %}{{ version }}{% if not loop.last %},{% endif %}{% endfor %}{% raw %}}{% endraw %}
{% else %} {% else %}
# 2.11 has been disabled: couldn't resolve module/action 'docker_container'. envlist = py{39}-ansible-{2.9,2.10,2.11}
envlist = py{39}-ansible-{2.9,2.10}
{% endif %} {% endif %}
skipsdist = true skipsdist = true
@ -13,8 +12,8 @@ skipsdist = true
[testenv] [testenv]
deps = deps =
2.9: ansible == 2.9.* 2.9: ansible == 2.9.*
2.10: ansible == 2.10.* 2.10: ansible-base == 2.10.*
2.11: git+https://github.com/ansible/ansible.git@devel 2.11: ansible-core == 2.11.*
molecule[docker] molecule[docker]
docker == 4.* docker == 4.*
ansible-lint == 5.* ansible-lint == 5.*
@ -25,4 +24,4 @@ setenv =
ANSIBLE_FORCE_COLOR=1 ANSIBLE_FORCE_COLOR=1
ANSIBLE_ROLES_PATH=../ ANSIBLE_ROLES_PATH=../
passenv = namespace image tag passenv = namespace image tag DOCKER_HOST