[vmtest] using danobi/vmtest

chantra · Oct 21, 2023 · 17d5859 · 17d5859
1 parent 31d6168
commit 17d5859
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/.github/scripts/matrix.py b/.github/scripts/matrix.py
@@ -55,21 +55,25 @@ def get_tests(config):
     return [test for test in tests if not test.endswith("parallel")]
 
 
-matrix = [
+"""
     {
         "kernel": "LATEST",
         "runs_on": [],
         "arch": Arch.X86_64.value,
         "toolchain": "gcc",
         "llvm-version": "16",
     },
+"""
+matrix = [
     {
         "kernel": "LATEST",
         "runs_on": [],
         "arch": Arch.X86_64.value,
         "toolchain": "llvm",
         "llvm-version": "16",
     },
+]
+"""
     {
         "kernel": "LATEST",
         "runs_on": [],
@@ -93,6 +97,7 @@ def get_tests(config):
         "parallel_tests": False,
     },
 ]
+"""
 self_hosted_repos = [
     "kernel-patches/bpf",
     "kernel-patches/vmtest",
@@ -132,10 +137,13 @@ def get_tests(config):
 }
 set_output("test_matrix", dumps(test_matrix))
 
-veristat_runs_on = next(
+veristat_runs_on = []
+"""
+next(
     x["runs_on"]
     for x in matrix
     if x["arch"] == os.environ["veristat_arch"]
     and x["toolchain"] == os.environ["veristat_toolchain"]
 )
+"""
 set_output("veristat_runs_on", veristat_runs_on)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -150,18 +150,8 @@ jobs:
       - name: Untar artifacts
         # zstd is installed by default in the runner images.
         run: zstd -d -T0  vmlinux-${{ matrix.arch }}-${{ matrix.toolchain_full }}.tar.zst --stdout | tar -xf -
-      - name: Prepare rootfs
-        uses: libbpf/ci/prepare-rootfs@main
-        with:
-          project-name: 'libbpf'
-          arch: ${{ matrix.arch }}
-          kernel: ${{ matrix.kernel }}
-          kernel-root: '.'
-          kbuild-output: ${{ env.KBUILD_OUTPUT }}
-          image-output: '/tmp/root.img'
-          test: ${{ matrix.test }}
       - name: Run selftests
-        uses: libbpf/ci/run-qemu@main
+        uses: chantra/libbpf-ci/run-qemu@vmtest
         continue-on-error: ${{ matrix.continue_on_error }}
         timeout-minutes: ${{ matrix.timeout_minutes }}
         with: