From 381426d6d59d850e4c598935f9af06e0bea8d91f Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Tue, 4 Nov 2025 09:24:28 +0100
Subject: [PATCH 1/4] cri-docker: molecule: move container_manager to inventory
 var

---
 .../container-engine/cri-dockerd/molecule/default/molecule.yml  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/roles/container-engine/cri-dockerd/molecule/default/molecule.yml b/roles/container-engine/cri-dockerd/molecule/default/molecule.yml
index 787023764..631e63599 100644
--- a/roles/container-engine/cri-dockerd/molecule/default/molecule.yml
+++ b/roles/container-engine/cri-dockerd/molecule/default/molecule.yml
@@ -25,6 +25,8 @@ provisioner:
     group_vars:
       all:
         become: true
+      k8s_cluster:
+        container_manager: docker
   playbooks:
     create: ../../../../../tests/cloud_playbooks/create-kubevirt.yml
     prepare: ../../../molecule/prepare.yml

From bde51ebddf7af7a37942233ff1b47248806c2a21 Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Tue, 4 Nov 2025 09:27:00 +0100
Subject: [PATCH 2/4] youki: molecule: move variables to inventory

Fix download/file (which needs the variable to determine the correct
binaries)
---
 roles/container-engine/youki/molecule/default/molecule.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/roles/container-engine/youki/molecule/default/molecule.yml b/roles/container-engine/youki/molecule/default/molecule.yml
index f73a9775c..133108865 100644
--- a/roles/container-engine/youki/molecule/default/molecule.yml
+++ b/roles/container-engine/youki/molecule/default/molecule.yml
@@ -21,6 +21,11 @@ provisioner:
     defaults:
       callbacks_enabled: profile_tasks
       timeout: 120
+  inventory:
+    group_vars:
+      k8s_cluster:
+        youki_enabled: true
+        container_manager: crio
   playbooks:
     create: ../../../../../tests/cloud_playbooks/create-kubevirt.yml
     prepare: ../../../molecule/prepare.yml

From b4fe577203bd009ec2ebf9cc596731cb9ab1c607 Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Tue, 4 Nov 2025 09:27:00 +0100
Subject: [PATCH 3/4] gvisor: molecule: move variables to inventory

Fix download/file (which needs the variable to determine the correct
binaries)
---
 roles/container-engine/gvisor/molecule/default/molecule.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/roles/container-engine/gvisor/molecule/default/molecule.yml b/roles/container-engine/gvisor/molecule/default/molecule.yml
index f73a9775c..0ffe92445 100644
--- a/roles/container-engine/gvisor/molecule/default/molecule.yml
+++ b/roles/container-engine/gvisor/molecule/default/molecule.yml
@@ -21,6 +21,11 @@ provisioner:
     defaults:
       callbacks_enabled: profile_tasks
       timeout: 120
+  inventory:
+    group_vars:
+      k8s_cluster:
+        gvisor_enabled: true
+        container_manager: containerd
   playbooks:
     create: ../../../../../tests/cloud_playbooks/create-kubevirt.yml
     prepare: ../../../molecule/prepare.yml

From 5183679a89618fb39c56b049f45d8df0050eedf5 Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Tue, 4 Nov 2025 09:27:00 +0100
Subject: [PATCH 4/4] crio: molecule: move variables to inventory

Fix download/file (which needs the variable to determine the correct
binaries)
---
 roles/container-engine/cri-o/molecule/default/converge.yml | 2 --
 roles/container-engine/cri-o/molecule/default/molecule.yml | 4 ++++
 roles/container-engine/cri-o/molecule/default/verify.yml   | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/roles/container-engine/cri-o/molecule/default/converge.yml b/roles/container-engine/cri-o/molecule/default/converge.yml
index 85361b439..8badf5f40 100644
--- a/roles/container-engine/cri-o/molecule/default/converge.yml
+++ b/roles/container-engine/cri-o/molecule/default/converge.yml
@@ -2,8 +2,6 @@
 - name: Converge
   hosts: all
   become: true
-  vars:
-    container_manager: crio
   roles:
     - role: kubespray_defaults
     - role: container-engine/cri-o
diff --git a/roles/container-engine/cri-o/molecule/default/molecule.yml b/roles/container-engine/cri-o/molecule/default/molecule.yml
index e5bf20e5d..6d973b262 100644
--- a/roles/container-engine/cri-o/molecule/default/molecule.yml
+++ b/roles/container-engine/cri-o/molecule/default/molecule.yml
@@ -41,6 +41,10 @@ provisioner:
     defaults:
       callbacks_enabled: profile_tasks
       timeout: 120
+  inventory:
+    group_vars:
+      k8s_cluster:
+        container_manager: crio
   playbooks:
     create: ../../../../../tests/cloud_playbooks/create-kubevirt.yml
     prepare: ../../../molecule/prepare.yml
diff --git a/roles/container-engine/cri-o/molecule/default/verify.yml b/roles/container-engine/cri-o/molecule/default/verify.yml
index a40eb34d5..ca109f97d 100644
--- a/roles/container-engine/cri-o/molecule/default/verify.yml
+++ b/roles/container-engine/cri-o/molecule/default/verify.yml
@@ -2,7 +2,6 @@
 - name: Test CRI-O cri
   import_playbook: ../../../molecule/test_cri.yml
   vars:
-    container_manager: crio
     cri_socket: unix:///var/run/crio/crio.sock
     cri_name: cri-o
 - name: Test running a container with crun