From 14bf653c352f6d39ab9e07aae9974d400d5a27f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano@fidencio.org>
Date: Fri, 28 Feb 2025 16:45:24 +0100
Subject: [PATCH] tests: kata-deploy: Re-add tests, now using github runners
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As GitHub runners now support nested virt, we're don't depend on garm
for those anymore.

Signed-off-by: Fabiano Fidêncio <fabiano@fidencio.org>
---
 .github/workflows/ci.yaml                            | 12 ++++++++++++
 ...tests-on-garm.yaml => run-kata-deploy-tests.yaml} |  8 ++------
 2 files changed, 14 insertions(+), 6 deletions(-)
 rename .github/workflows/{run-kata-deploy-tests-on-garm.yaml => run-kata-deploy-tests.yaml} (81%)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ed7a1eecfb..b78f34295d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -283,6 +283,18 @@ jobs:
       pr-number: ${{ inputs.pr-number }}
       target-branch: ${{ inputs.target-branch }}
 
+  run-kata-deploy-tests:
+    if: ${{ inputs.skip-test != 'yes' }}
+    needs: [publish-kata-deploy-payload-amd64]
+    uses: ./.github/workflows/run-kata-deploy-tests.yaml
+    with:
+      registry: ghcr.io
+      repo: ${{ github.repository_owner }}/kata-deploy-ci
+      tag: ${{ inputs.tag }}-amd64
+      commit-hash: ${{ inputs.commit-hash }}
+      pr-number: ${{ inputs.pr-number }}
+      target-branch: ${{ inputs.target-branch }}
+
   run-metrics-tests:
     if: ${{ inputs.skip-test != 'yes' }}
     needs: build-kata-static-tarball-amd64
diff --git a/.github/workflows/run-kata-deploy-tests-on-garm.yaml b/.github/workflows/run-kata-deploy-tests.yaml
similarity index 81%
rename from .github/workflows/run-kata-deploy-tests-on-garm.yaml
rename to .github/workflows/run-kata-deploy-tests.yaml
index ce2ebf5403..30f31875c8 100644
--- a/.github/workflows/run-kata-deploy-tests-on-garm.yaml
+++ b/.github/workflows/run-kata-deploy-tests.yaml
@@ -1,4 +1,4 @@
-name: CI | Run kata-deploy tests on GARM
+name: CI | Run kata-deploy tests
 on:
   workflow_call:
     inputs:
@@ -35,11 +35,7 @@ jobs:
           - k3s
           - rke2
           - microk8s
-    # TODO: There are a couple of vmm/k8s combination failing (https://github.com/kata-containers/kata-containers/issues/9854)
-    # and we will put the entire kata-deploy-tests on GARM on maintenance.
-    # TODO: Transition to free runner (see #9940).
-    if: false
-    runs-on: garm-ubuntu-2004-smaller
+    runs-on: ubuntu-22.04
     env:
       DOCKER_REGISTRY: ${{ inputs.registry }}
       DOCKER_REPO: ${{ inputs.repo }}