mirror of
https://github.com/netdata/libbpf.git
synced 2026-04-09 01:59:06 +08:00
ci: remove LATEST kernel handling from vmtest
The libbpf CI always builds the kernel from source at CHECKPOINT-COMMIT; there is no prebuilt-kernel matrix entry. Remove the `kernel` input and the conditional build-vs-download logic, simplifying the workflow. The run-vmtest action defaults KERNEL to "LATEST" internally when the env var is unset, so DENYLIST-LATEST is still picked up. The vmlinuz path is auto-discovered via `make -s image_name` when not passed. Assisted-by: Claude:claude-opus-4-6 Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
This commit is contained in:
committed by
Andrii Nakryiko
parent
09ae947cd8
commit
6b9b5e34b1
6
.github/workflows/test.yml
vendored
6
.github/workflows/test.yml
vendored
@@ -16,16 +16,14 @@ jobs:
|
|||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- kernel: 'LATEST'
|
- runs_on: 'ubuntu-24.04'
|
||||||
runs_on: 'ubuntu-24.04'
|
|
||||||
arch: 'x86_64'
|
arch: 'x86_64'
|
||||||
llvm-version: '21'
|
llvm-version: '21'
|
||||||
pahole: 'master'
|
pahole: 'master'
|
||||||
name: Linux ${{ matrix.kernel }} llvm-${{ matrix.llvm-version }}
|
name: llvm-${{ matrix.llvm-version }}
|
||||||
uses: ./.github/workflows/vmtest.yml
|
uses: ./.github/workflows/vmtest.yml
|
||||||
with:
|
with:
|
||||||
runs_on: ${{ matrix.runs_on }}
|
runs_on: ${{ matrix.runs_on }}
|
||||||
kernel: ${{ matrix.kernel }}
|
|
||||||
arch: ${{ matrix.arch }}
|
arch: ${{ matrix.arch }}
|
||||||
llvm-version: ${{ matrix.llvm-version }}
|
llvm-version: ${{ matrix.llvm-version }}
|
||||||
pahole: ${{ matrix.pahole }}
|
pahole: ${{ matrix.pahole }}
|
||||||
|
|||||||
16
.github/workflows/vmtest.yml
vendored
16
.github/workflows/vmtest.yml
vendored
@@ -12,11 +12,6 @@ on:
|
|||||||
required: true
|
required: true
|
||||||
default: 'x86_64'
|
default: 'x86_64'
|
||||||
type: string
|
type: string
|
||||||
kernel:
|
|
||||||
description: 'kernel version or LATEST'
|
|
||||||
required: true
|
|
||||||
default: 'LATEST'
|
|
||||||
type: string
|
|
||||||
pahole:
|
pahole:
|
||||||
description: 'pahole rev or branch'
|
description: 'pahole rev or branch'
|
||||||
required: false
|
required: false
|
||||||
@@ -73,7 +68,6 @@ jobs:
|
|||||||
cd -
|
cd -
|
||||||
|
|
||||||
- name: Build kernel image
|
- name: Build kernel image
|
||||||
if: ${{ inputs.kernel == 'LATEST' }}
|
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
cd .kernel
|
cd .kernel
|
||||||
@@ -81,19 +75,11 @@ jobs:
|
|||||||
cp vmlinux ${{ github.workspace }}
|
cp vmlinux ${{ github.workspace }}
|
||||||
cd -
|
cd -
|
||||||
|
|
||||||
- name: Download prebuilt kernel
|
|
||||||
if: ${{ inputs.kernel != 'LATEST' }}
|
|
||||||
uses: libbpf/ci/download-vmlinux@v4
|
|
||||||
with:
|
|
||||||
kernel: ${{ inputs.kernel }}
|
|
||||||
arch: ${{ inputs.arch }}
|
|
||||||
|
|
||||||
- name: Build selftests/bpf
|
- name: Build selftests/bpf
|
||||||
uses: libbpf/ci/build-selftests@v4
|
uses: libbpf/ci/build-selftests@v4
|
||||||
env:
|
env:
|
||||||
MAX_MAKE_JOBS: 32
|
MAX_MAKE_JOBS: 32
|
||||||
VMLINUX_BTF: ${{ github.workspace }}/vmlinux
|
VMLINUX_BTF: ${{ github.workspace }}/vmlinux
|
||||||
VMLINUX_H: ${{ inputs.kernel != 'LATEST' && format('{0}/.github/actions/build-selftests/vmlinux.h', github.workspace) || '' }}
|
|
||||||
with:
|
with:
|
||||||
arch: ${{ inputs.arch }}
|
arch: ${{ inputs.arch }}
|
||||||
kernel-root: ${{ github.workspace }}/.kernel
|
kernel-root: ${{ github.workspace }}/.kernel
|
||||||
@@ -103,7 +89,6 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
ALLOWLIST_FILE: /tmp/allowlist
|
ALLOWLIST_FILE: /tmp/allowlist
|
||||||
DENYLIST_FILE: /tmp/denylist
|
DENYLIST_FILE: /tmp/denylist
|
||||||
KERNEL: ${{ inputs.kernel }}
|
|
||||||
VMLINUX: ${{ github.workspace }}/vmlinux
|
VMLINUX: ${{ github.workspace }}/vmlinux
|
||||||
LLVM_VERSION: ${{ inputs.llvm-version }}
|
LLVM_VERSION: ${{ inputs.llvm-version }}
|
||||||
SELFTESTS_BPF: ${{ github.workspace }}/.kernel/tools/testing/selftests/bpf
|
SELFTESTS_BPF: ${{ github.workspace }}/.kernel/tools/testing/selftests/bpf
|
||||||
@@ -113,5 +98,4 @@ jobs:
|
|||||||
arch: ${{ inputs.arch }}
|
arch: ${{ inputs.arch }}
|
||||||
kbuild-output: ${{ github.workspace }}/.kernel
|
kbuild-output: ${{ github.workspace }}/.kernel
|
||||||
kernel-root: ${{ github.workspace }}/.kernel
|
kernel-root: ${{ github.workspace }}/.kernel
|
||||||
vmlinuz: ${{ inputs.arch }}/vmlinuz-${{ inputs.kernel }}
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user