From 37a847c0b2b84dae9a027b436aa57a6acaeed7ed Mon Sep 17 00:00:00 2001
From: Wainer dos Santos Moschetta <wainersm@redhat.com>
Date: Fri, 27 Sep 2024 16:54:12 -0300
Subject: [PATCH] workflows/libvirt: add e2e job to test with CRI-O

Added a new container_runtime matrix column to generate
one job for each runtime: containerd and crio.

Fixes #1981
Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
---
 .github/workflows/e2e_libvirt.yaml                    | 8 ++++++++
 .github/workflows/e2e_run_all.yaml                    | 1 +
 src/cloud-api-adaptor/libvirt/e2e_matrix_libvirt.json | 1 +
 3 files changed, 10 insertions(+)

diff --git a/.github/workflows/e2e_libvirt.yaml b/.github/workflows/e2e_libvirt.yaml
index 7de7111b6..3d9c12d64 100644
--- a/.github/workflows/e2e_libvirt.yaml
+++ b/.github/workflows/e2e_libvirt.yaml
@@ -28,6 +28,12 @@ on:
         description: SecureComms configuration. Defaults to none.
         required: false
         type: string
+      container_runtime:
+        default: 'containerd'
+        description: Name of the container runtime. Either containerd or crio.
+        required: false
+        type: string
+
 env:
   CLOUD_PROVIDER: libvirt
   DEBIAN_FRONTEND: noninteractive
@@ -93,6 +99,7 @@ jobs:
           export TEST_E2E_SECURE_COMMS="${{ inputs.secure_comms }}"
           ./libvirt/config_libvirt.sh
           echo "CAA_IMAGE=\"${{ inputs.caa_image }}\"" >> libvirt.properties
+          echo "container_runtime=\"${{ inputs.container_runtime }}\"" >> libvirt.properties
           # For debugging
           cat libvirt.properties
 
@@ -123,6 +130,7 @@ jobs:
           REGISTRY_CREDENTIAL_ENCODED: ${{ secrets.REGISTRY_CREDENTIAL_ENCODED }}
         run: |
           export CLOUD_PROVIDER=libvirt
+          export CONTAINER_RUNTIME="${{ inputs.container_runtime }}"
           export DEPLOY_KBS=true
           export TEST_PROVISION="yes"
           export TEST_TEARDOWN="no"
diff --git a/.github/workflows/e2e_run_all.yaml b/.github/workflows/e2e_run_all.yaml
index d9dff137c..871daf612 100644
--- a/.github/workflows/e2e_run_all.yaml
+++ b/.github/workflows/e2e_run_all.yaml
@@ -169,6 +169,7 @@ jobs:
     uses: ./.github/workflows/e2e_libvirt.yaml
     with:
       caa_image: ${{ inputs.registry }}/cloud-api-adaptor:${{ inputs.caa_image_tag }}-dev
+      container_runtime: ${{ matrix.container_runtime }}
       podvm_image: ${{ inputs.registry }}/podvm-${{ matrix.provider }}-${{ matrix.os }}-${{ matrix.arch }}:${{ inputs.podvm_image_tag }}
       install_directory_artifact: install_directory
       git_ref: ${{ inputs.git_ref }}
diff --git a/src/cloud-api-adaptor/libvirt/e2e_matrix_libvirt.json b/src/cloud-api-adaptor/libvirt/e2e_matrix_libvirt.json
index 994063519..d0ed40b54 100644
--- a/src/cloud-api-adaptor/libvirt/e2e_matrix_libvirt.json
+++ b/src/cloud-api-adaptor/libvirt/e2e_matrix_libvirt.json
@@ -1,4 +1,5 @@
 {
+    "container_runtime": ["containerd", "crio"],
     "secure_comms": ["none"],
     "os": ["ubuntu"],
     "provider": ["generic"],