From 1ccb3a38a28a741e4505f7ae60060f13060979c8 Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Fri, 13 Jun 2025 17:09:05 +0200
Subject: [PATCH] Convert cri-dockerd molecule to ansible verifier

---
 .../cri-dockerd/molecule/default/molecule.yml |  2 +-
 .../molecule/default/tests/test_default.py    | 19 -------------------
 .../cri-dockerd/molecule/default/verify.yml   | 15 +++++++++++++++
 3 files changed, 16 insertions(+), 20 deletions(-)
 delete mode 100644 roles/container-engine/cri-dockerd/molecule/default/tests/test_default.py
 create mode 100644 roles/container-engine/cri-dockerd/molecule/default/verify.yml

diff --git a/roles/container-engine/cri-dockerd/molecule/default/molecule.yml b/roles/container-engine/cri-dockerd/molecule/default/molecule.yml
index 83384d738..20ef396b5 100644
--- a/roles/container-engine/cri-dockerd/molecule/default/molecule.yml
+++ b/roles/container-engine/cri-dockerd/molecule/default/molecule.yml
@@ -29,4 +29,4 @@ provisioner:
     create: ../../../../../tests/cloud_playbooks/create-kubevirt.yml
     prepare: ../../../molecule/prepare.yml
 verifier:
-  name: testinfra
+  name: ansible
diff --git a/roles/container-engine/cri-dockerd/molecule/default/tests/test_default.py b/roles/container-engine/cri-dockerd/molecule/default/tests/test_default.py
deleted file mode 100644
index dc99b3498..000000000
--- a/roles/container-engine/cri-dockerd/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_run_pod(host):
-    run_command = "/usr/local/bin/crictl run --with-pull /tmp/container.json /tmp/sandbox.json"
-    with host.sudo():
-        cmd = host.command(run_command)
-    assert cmd.rc == 0
-
-    with host.sudo():
-      log_f = host.file("/tmp/cri-dockerd1.0.log")
-
-      assert log_f.exists
-      assert b"Hello from Docker" in log_f.content
diff --git a/roles/container-engine/cri-dockerd/molecule/default/verify.yml b/roles/container-engine/cri-dockerd/molecule/default/verify.yml
new file mode 100644
index 000000000..a11eb86f5
--- /dev/null
+++ b/roles/container-engine/cri-dockerd/molecule/default/verify.yml
@@ -0,0 +1,15 @@
+---
+- name: Test cri-dockerd
+  import_playbook: ../../../molecule/test_cri.yml
+  vars:
+    container_manager: cri-dockerd
+    cri_socket: unix:///var/run/cri-dockerd.sock
+    cri_name: docker
+
+- name: Test running a container with docker
+  import_playbook: ../../../molecule/test_runtime.yml
+  vars:
+    container_runtime: docker
+  # cri-dockerd does not support multiple runtime handler before 0.4.0
+  # https://github.com/Mirantis/cri-dockerd/pull/350
+  # TODO: check this when we upgrade cri-dockerd