From dfb8ae29931912b7c03703d2ae80bff4ee2a5aca Mon Sep 17 00:00:00 2001
From: Krisztian Litkey <krisztian.litkey@intel.com>
Date: Thu, 19 Sep 2024 08:10:52 +0300
Subject: [PATCH] e2e: set fedora CNI plugin path for containerd.

Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
---
 test/e2e/playbook/provision.yaml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/test/e2e/playbook/provision.yaml b/test/e2e/playbook/provision.yaml
index 4e1b72805..1a704ce6a 100644
--- a/test/e2e/playbook/provision.yaml
+++ b/test/e2e/playbook/provision.yaml
@@ -290,12 +290,20 @@
 
     - name: Configure containerd
       when: is_containerd
-      ansible.builtin.shell: "{{ item }}"
-      with_items:
-        - mkdir -p /etc/containerd
-        - containerd config default > /etc/containerd/config.toml
-        - sed -i 's/^.*disabled_plugins *= *.*$/disabled_plugins = []/' /etc/containerd/config.toml
-        - sed -i 's/SystemdCgroup = false/SystemdCgroup = true/g' /etc/containerd/config.toml
+      block:
+        - name: Create containerd configuration
+          ansible.builtin.shell: "{{ item }}"
+          with_items:
+            - mkdir -p /etc/containerd
+            - containerd config default > /etc/containerd/config.toml
+            - sed -i 's/^.*disabled_plugins *= *.*$/disabled_plugins = []/' /etc/containerd/config.toml
+            - sed -i 's/SystemdCgroup = false/SystemdCgroup = true/g' /etc/containerd/config.toml
+
+        - name: Update CNI plugin directory on Fedora
+          when: ansible_facts['distribution'] == "Fedora"
+          ansible.builtin.shell: "{{ item }}"
+          with_items:
+            - sed -i 's:/opt/cni/bin:/usr/libexec/cni:g' /etc/containerd/config.toml
 
     - name: Setup NRI
       ansible.builtin.file: