From ec93510c483c2a0c82d2f0b2233cb670e1456015 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 | 7 +++++++
 .github/workflows/e2e_run_all.yaml | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/.github/workflows/e2e_libvirt.yaml b/.github/workflows/e2e_libvirt.yaml
index 6526c7178..422290b09 100644
--- a/.github/workflows/e2e_libvirt.yaml
+++ b/.github/workflows/e2e_libvirt.yaml
@@ -23,6 +23,11 @@ on:
         description: Git ref to checkout the cloud-api-adaptor repository. Defaults to main.
         required: false
         type: string
+      container_runtime:
+        default: 'containerd'
+        description: Either containerd or crio. Defaults to containerd.
+        required: false
+        type: string
 
 env:
   CLOUD_PROVIDER: libvirt
@@ -86,6 +91,7 @@ jobs:
         run: |
           ./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
 
@@ -117,6 +123,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 cfbf0162c..5c7bace10 100644
--- a/.github/workflows/e2e_run_all.yaml
+++ b/.github/workflows/e2e_run_all.yaml
@@ -159,6 +159,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        container_runtime:
+          - containerd
+          - crio
         os:
           - ubuntu
         provider:
@@ -168,6 +171,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 }}