Skip to content

Commit c4bc586

Browse files
committed
Regernerate CI, fix molecule and tox.
1 parent ba863ce commit c4bc586

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

molecule/default/molecule.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,5 @@ platforms:
2222
pre_build_image: yes
2323
provisioner:
2424
name: ansible
25-
config_options:
26-
defaults:
27-
stdout_callback: yaml
28-
bin_ansible_callbacks: yes
2925
verifier:
3026
name: ansible

tox.ini

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@
33
#
44
[tox]
55
minversion = 3.21.4
6-
# 2.11 has been disabled: couldn't resolve module/action 'docker_container'.
7-
envlist = py{39}-ansible-{2.9,2.10}
6+
envlist = py{39}-ansible-{2.9,2.10,2.11}
87

98
skipsdist = true
109

1110
[testenv]
1211
deps =
1312
2.9: ansible == 2.9.*
14-
2.10: ansible == 2.10.*
15-
2.11: git+https://github.com/ansible/ansible.git@devel
13+
2.10: ansible-base == 2.10.*
14+
2.11: ansible-core == 2.11.*
1615
molecule[docker]
1716
docker == 4.*
1817
ansible-lint == 5.*
@@ -23,4 +22,4 @@ setenv =
2322
ANSIBLE_FORCE_COLOR=1
2423
ANSIBLE_ROLES_PATH=../
2524

26-
passenv = namespace image tag
25+
passenv = namespace image tag DOCKER_HOST

0 commit comments

Comments
 (0)