diff --git a/.ansible-lint b/.ansible-lint index eba57d1..7a17121 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -4,5 +4,9 @@ exclude_paths: - ./meta/exception.yml - ./meta/preferences.yml + - ./molecule/default/prepare.yml + - ./molecule/default/converge.yml - ./molecule/default/verify.yml + - ./molecule/default/collections.yml - ./.tox + - ./.cache diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 95ccf41..329e3c4 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -22,7 +22,7 @@ jobs: with: path: "${{ github.repository }}" - name: molecule - uses: robertdebock/molecule-action@2.6.8 + uses: robertdebock/molecule-action@2.6.16 with: command: lint test: @@ -49,8 +49,6 @@ jobs: tag: "32" - image: "fedora" tag: "latest" - - image: "fedora" - tag: "rawhide" - image: "ubuntu" tag: "latest" - image: "ubuntu" @@ -65,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.6.8 + uses: robertdebock/molecule-action@2.6.16 with: image: ${{ matrix.config.image }} tag: ${{ matrix.config.tag }} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d765748..8013363 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,8 +32,6 @@ molecule: tag: "32" - image: "fedora" tag: "latest" - - image: "fedora" - tag: "rawhide" - image: "ubuntu" tag: "latest" - image: "ubuntu" diff --git a/.yamllint b/.yamllint index 894450c..a7ff098 100644 --- a/.yamllint +++ b/.yamllint @@ -13,3 +13,4 @@ rules: ignore: | .tox/ + .cache/ diff --git a/molecule/default/collections.yml b/molecule/default/collections.yml new file mode 100644 index 0000000..b69b20e --- /dev/null +++ b/molecule/default/collections.yml @@ -0,0 +1,6 @@ +--- +collections: + - name: community.docker + version: "== 1.*" + - name: community.general + version: "== 2.*" diff --git a/tox.ini b/tox.ini index 0b19c6e..f57553b 100644 --- a/tox.ini +++ b/tox.ini @@ -2,25 +2,25 @@ # Ansible managed # [tox] -minversion = 3.20 -# These environments are disabled: -# previous: Because collections don't work. ETA Fix: ansible-2.11 released. -envlist = py{39}-ansible-{current,next} +minversion = 3.21.4 +# 2.11 has been disabled: couldn't resolve module/action 'docker_container'. +envlist = py{39}-ansible-{2.9,2.10} skipsdist = true [testenv] deps = - previous: ansible>=2.9, <2.10 - current: ansible - next: git+https://github.com/ansible/ansible.git@devel - molecule[docker]>=3, <4 - docker>=4.2, <4.3 - ansible-lint + 2.9: ansible == 2.9.* + 2.10: ansible == 2.10.* + 2.11: git+https://github.com/ansible/ansible.git@devel + molecule[docker] + docker == 4.* + ansible-lint == 5.* commands = molecule test setenv = TOX_ENVNAME={envname} PY_COLORS=1 ANSIBLE_FORCE_COLOR=1 + ANSIBLE_ROLES_PATH=../ passenv = namespace image tag