From 779cb2b65b3f3a8ca16ae61afcd02969915dff1a Mon Sep 17 00:00:00 2001
From: Ihor Solodrai <ihor.solodrai@pm.me>
Date: Fri, 1 Nov 2024 13:02:32 -0700
Subject: [PATCH] ci: use libbpf/ci/run-vmtest action to run selftests

Signed-off-by: Ihor Solodrai <ihor.solodrai@pm.me>
---
 .github/actions/vmtest/action.yml | 24 ++++++------------------
 .github/workflows/test.yml        |  2 ++
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/.github/actions/vmtest/action.yml b/.github/actions/vmtest/action.yml
index 6bf6cdb..20d04ed 100644
--- a/.github/actions/vmtest/action.yml
+++ b/.github/actions/vmtest/action.yml
@@ -99,26 +99,14 @@ runs:
         repo-path: '.kernel'
         kernel: ${{ inputs.kernel }}
         llvm-version: ${{ inputs.llvm-version }}
-    # 4. prepare rootfs
-    - name: prepare rootfs
-      uses: libbpf/ci/prepare-rootfs@main
-      env:
-        KBUILD_OUTPUT: '.kernel'
-      with:
-        project-name: 'libbpf'
-        arch: ${{ inputs.arch }}
-        kernel: ${{ inputs.kernel }}
-        kernel-root: '.kernel'
-        kbuild-output: ${{ env.KBUILD_OUTPUT }}
-        image-output: '/tmp/root.img'
-    # 5. run selftest in QEMU
+    # 4. Run selftest via vmtest tool (https://github.com/danobi/vmtest)
     - name: Run selftests
       env:
         KERNEL: ${{ inputs.kernel }}
-        REPO_ROOT: ${{ github.workspace }}
-      uses: libbpf/ci/run-qemu@main
+      uses: theihor/libbpf-ci/run-vmtest@run-vmtest-v2
       with:
         arch: ${{ inputs.arch }}
-        img: '/tmp/root.img'
-        vmlinuz: 'vmlinuz'
-        kernel-root: '.kernel'
+        kbuild-output: ${{ github.workspace }}/.kernel
+        kernel-root: ${{ github.workspace }}/.kernel
+        img: '' # this is a required action input currently, but actually is not used
+        vmlinuz: ${{ github.workspace }}/vmlinux
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 94d1a4f..e293128 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,6 +28,8 @@ jobs:
         name: Setup
       - uses: ./.github/actions/vmtest
         name: vmtest
+        continue-on-error: false
+        timeout-minutes: 180
         with:
           kernel: ${{ matrix.kernel }}
           arch: ${{ matrix.arch }}