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>
This commit is contained in:
Ihor Solodrai
2024-11-14 17:41:08 -08:00
committed by Andrii Nakryiko
parent 39e4e86263
commit cd73a17321
3 changed files with 27 additions and 8 deletions

View File

@@ -15,11 +15,22 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
arch: ['x86_64'] include:
kernel: ['LATEST'] - kernel: 'LATEST'
llvm-version: ['17', '18'] runs_on: 'ubuntu-24.04'
pahole: ['master', 'tmp.master'] arch: 'x86_64'
runs_on: ['ubuntu-24.04'] 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 }} name: ${{ matrix.kernel }} kernel llvm-${{ matrix.llvm-version }} pahole@${{ matrix.pahole }}
uses: ./.github/workflows/vmtest.yml uses: ./.github/workflows/vmtest.yml
with: with:

View File

@@ -29,6 +29,7 @@ on:
type: string type: string
jobs: jobs:
vmtest: vmtest:
name: llvm-${{ inputs.llvm-version }} pahole@${{ inputs.pahole }} linux-${{ inputs.kernel }}
runs-on: ${{ inputs.runs_on }} runs-on: ${{ inputs.runs_on }}
steps: steps:
@@ -114,6 +115,7 @@ jobs:
DENYLIST_FILE: /tmp/denylist DENYLIST_FILE: /tmp/denylist
ARCH: ${{ inputs.arch }} ARCH: ${{ inputs.arch }}
KERNEL: ${{ inputs.kernel }} KERNEL: ${{ inputs.kernel }}
LLVM_VERSION: ${{ inputs.llvm-version }}
SELFTESTS_BPF: ${{ github.workspace }}/.kernel/tools/testing/selftests/bpf SELFTESTS_BPF: ${{ github.workspace }}/.kernel/tools/testing/selftests/bpf
VMTEST_CONFIGS: ${{ github.workspace }}/ci/vmtest/configs VMTEST_CONFIGS: ${{ github.workspace }}/ci/vmtest/configs
shell: bash shell: bash

View File

@@ -8,7 +8,10 @@ function append_into() {
local files=("$@") local files=("$@")
echo -n > "$out" echo -n > "$out"
for file in "${files[@]}"; do for file in "${files[@]}"; do
cat "$file" >> "$out" || true if [[ -f "$file" ]]; then
echo "cat $file >> $out"
cat "$file" >> "$out"
fi
done done
} }
@@ -32,10 +35,13 @@ denylists=(
append_into "${DENYLIST_FILE}" "${denylists[@]}" append_into "${DENYLIST_FILE}" "${denylists[@]}"
if [[ "${KERNEL}" == "5.5.0" ]]; then if [[ "${LLVM_VERSION}" -lt 18 ]]; then
echo "KERNEL_TEST=test_progs test_progs_no_alu32" >> $GITHUB_ENV 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 fi
echo "cp -R ${SELFTESTS_BPF} ${GITHUB_WORKSPACE}/selftests"
mkdir -p "${GITHUB_WORKSPACE}/selftests" mkdir -p "${GITHUB_WORKSPACE}/selftests"
cp -R "${SELFTESTS_BPF}" "${GITHUB_WORKSPACE}/selftests" cp -R "${SELFTESTS_BPF}" "${GITHUB_WORKSPACE}/selftests"