From 556a489bd2a841d3b11948a5fb6c0d57837aeac3 Mon Sep 17 00:00:00 2001 From: Robert de Bock Date: Tue, 11 May 2021 10:50:12 +0200 Subject: [PATCH] Regernerate CI, fix molecule and tox. --- molecule/default/molecule.yml | 4 ---- tox.ini | 9 ++++----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index e13cdfc..7fd87e9 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -22,9 +22,5 @@ platforms: pre_build_image: yes provisioner: name: ansible - config_options: - defaults: - stdout_callback: yaml - bin_ansible_callbacks: yes verifier: name: ansible diff --git a/tox.ini b/tox.ini index f57553b..c1ade81 100644 --- a/tox.ini +++ b/tox.ini @@ -3,16 +3,15 @@ # [tox] minversion = 3.21.4 -# 2.11 has been disabled: couldn't resolve module/action 'docker_container'. -envlist = py{39}-ansible-{2.9,2.10} +envlist = py{39}-ansible-{2.9,2.10,2.11} skipsdist = true [testenv] deps = 2.9: ansible == 2.9.* - 2.10: ansible == 2.10.* - 2.11: git+https://github.com/ansible/ansible.git@devel + 2.10: ansible-base == 2.10.* + 2.11: ansible-core == 2.11.* molecule[docker] docker == 4.* ansible-lint == 5.* @@ -23,4 +22,4 @@ setenv = ANSIBLE_FORCE_COLOR=1 ANSIBLE_ROLES_PATH=../ -passenv = namespace image tag +passenv = namespace image tag DOCKER_HOST