molecule: Migrate to ansible-core with collections

ganto · Jun 17, 2024 · 5675d11 · 5675d11
1 parent 98efbc2
commit 5675d11
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,7 +31,10 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies.
-        run: pip3 install yamllint ansible-lint[community]
+        run: pip3 install yamllint ansible-lint
+
+      - name: Install Ansible collections
+        run: ansible-galaxy install -r molecule/docker/collections.yml
 
       - name: Add checkout to Ansible role path.
         run: |

diff --git a/molecule/docker/collections.yml b/molecule/docker/collections.yml
@@ -0,0 +1,4 @@
+---
+collections:
+  - name: community.docker
+  - name: community.general
diff --git a/molecule/docker/molecule.yml b/molecule/docker/molecule.yml
@@ -4,7 +4,8 @@
 
 dependency:
   name: galaxy
-  enabled: False
+  options:
+    requirements-file: collections.yml
 driver:
   name: docker
 platforms:
@@ -25,6 +26,8 @@ provisioner:
     converge: ${MOLECULE_PLAYBOOK:-converge.yml}
 scenario:
   test_sequence:
+    - dependency
+    - destroy
     - syntax
     - create
     - prepare

diff --git a/molecule/docker/requirements.txt b/molecule/docker/requirements.txt
@@ -1,4 +1,4 @@
-ansible
+ansible-core
 docker
 molecule
 molecule-plugins[docker]
diff --git a/molecule/podman/collections.yml b/molecule/podman/collections.yml
@@ -0,0 +1,4 @@
+---
+collections:
+  - name: community.general
+  - name: containers.podman
diff --git a/molecule/podman/molecule.yml b/molecule/podman/molecule.yml
@@ -4,7 +4,8 @@
 
 dependency:
   name: galaxy
-  enabled: False
+  options:
+    requirements-file: collections.yml
 driver:
   name: podman
 platforms:
@@ -24,6 +25,8 @@ provisioner:
     converge: ${MOLECULE_PLAYBOOK:-converge.yml}
 scenario:
   test_sequence:
+    - dependency
+    - destroy
     - syntax
     - create
     - prepare

diff --git a/molecule/podman/requirements.txt b/molecule/podman/requirements.txt
@@ -1,3 +1,3 @@
-ansible
+ansible-core
 molecule
 molecule-plugins[podman]