From cd73a1732122c3359f704f0f9653ddae5656fa8f Mon Sep 17 00:00:00 2001
From: Ihor Solodrai <ihor.solodrai@pm.me>
Date: Thu, 14 Nov 2024 17:41:08 -0800
Subject: [PATCH] ci: configure CI test jobs

* Don't run pahole@tmp.master + llvm-17 combination.
* Use descriptive name of for vmtest jobs
* Don't run test_progs_cpuv4 when LLVM_VERSION < 18 (same as on BPF CI)
* Add some logging to prepare-selftests-run.sh

Signed-off-by: Ihor Solodrai <ihor.solodrai@pm.me>
---
 .github/workflows/test.yml         | 21 ++++++++++++++++-----
 .github/workflows/vmtest.yml       |  2 ++
 ci/vmtest/prepare-selftests-run.sh | 12 +++++++++---
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 758142d..44e9ae1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,11 +15,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: ['x86_64']
-        kernel: ['LATEST']
-        llvm-version: ['17', '18']
-        pahole: ['master', 'tmp.master']
-        runs_on: ['ubuntu-24.04']
+        include:
+          - kernel: 'LATEST'
+            runs_on: 'ubuntu-24.04'
+            arch: 'x86_64'
+            llvm-version: '18'
+            pahole: 'master'
+          - kernel: 'LATEST'
+            runs_on: 'ubuntu-24.04'
+            arch: 'x86_64'
+            llvm-version: '17'
+            pahole: 'master'
+          - kernel: 'LATEST'
+            runs_on: 'ubuntu-24.04'
+            arch: 'x86_64'
+            llvm-version: '18'
+            pahole: 'tmp.master'
     name: ${{ matrix.kernel }} kernel llvm-${{ matrix.llvm-version }} pahole@${{ matrix.pahole }}
     uses: ./.github/workflows/vmtest.yml
     with:
diff --git a/.github/workflows/vmtest.yml b/.github/workflows/vmtest.yml
index d6ea86d..5e1732f 100644
--- a/.github/workflows/vmtest.yml
+++ b/.github/workflows/vmtest.yml
@@ -29,6 +29,7 @@ on:
         type: string
 jobs:
   vmtest:
+    name: llvm-${{ inputs.llvm-version }} pahole@${{ inputs.pahole }} linux-${{ inputs.kernel }}
     runs-on: ${{ inputs.runs_on }}
     steps:
 
@@ -114,6 +115,7 @@ jobs:
           DENYLIST_FILE: /tmp/denylist
           ARCH: ${{ inputs.arch }}
           KERNEL: ${{ inputs.kernel }}
+          LLVM_VERSION: ${{ inputs.llvm-version }}
           SELFTESTS_BPF: ${{ github.workspace }}/.kernel/tools/testing/selftests/bpf
           VMTEST_CONFIGS: ${{ github.workspace }}/ci/vmtest/configs
         shell: bash
diff --git a/ci/vmtest/prepare-selftests-run.sh b/ci/vmtest/prepare-selftests-run.sh
index cee1756..35a6d8a 100755
--- a/ci/vmtest/prepare-selftests-run.sh
+++ b/ci/vmtest/prepare-selftests-run.sh
@@ -8,7 +8,10 @@ function append_into() {
     local files=("$@")
     echo -n > "$out"
     for file in "${files[@]}"; do
-        cat "$file" >> "$out" || true
+        if [[ -f "$file" ]]; then
+            echo "cat $file >> $out"
+            cat "$file" >> "$out"
+        fi
     done
 }
 
@@ -32,10 +35,13 @@ denylists=(
 
 append_into "${DENYLIST_FILE}" "${denylists[@]}"
 
-if [[ "${KERNEL}" == "5.5.0" ]]; then
-    echo "KERNEL_TEST=test_progs test_progs_no_alu32" >> $GITHUB_ENV
+if [[ "${LLVM_VERSION}" -lt 18 ]]; then
+    echo "KERNEL_TEST=test_progs test_progs_no_alu32 test_maps test_verifier" >> $GITHUB_ENV
+else # all
+    echo "KERNEL_TEST=test_progs test_progs_cpuv4 test_progs_no_alu32 test_maps test_verifier" >> $GITHUB_ENV
 fi
 
+echo "cp -R ${SELFTESTS_BPF} ${GITHUB_WORKSPACE}/selftests"
 mkdir -p "${GITHUB_WORKSPACE}/selftests"
 cp -R "${SELFTESTS_BPF}" "${GITHUB_WORKSPACE}/selftests"