Skip to content

Commit 870bf9c

Browse files
committed
[testing] selftests/bpf with ASAN
1 parent f72ed8b commit 870bf9c

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

.github/workflows/kernel-build.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,8 @@ jobs:
6060
KBUILD_OUTPUT: ${{ github.workspace }}/kbuild-output
6161
KERNEL: ${{ inputs.kernel }}
6262
KERNEL_ROOT: ${{ github.workspace }}
63-
KERNEL_ORIGIN: ${{ github.repository == 'kernel-patches/bpf-rc' && 'https://github.com/kernel-patches/bpf-rc.git'
64-
|| 'https://github.com/kernel-patches/bpf.git'
65-
}}
66-
KERNEL_REVISION: ${{ inputs.download_sources && 'bpf-next' || github.sha }}
63+
KERNEL_ORIGIN: 'https://github.com/kernel-patches/bpf.git'
64+
KERNEL_REVISION: bpf
6765
REFERENCE_REPO_PATH: /libbpfci/mirrors/linux
6866
REPO_PATH: ""
6967
REPO_ROOT: ${{ github.workspace }}

.github/workflows/kernel-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
run: zstd -d -T0 vmlinux-${{ inputs.arch }}-${{ inputs.toolchain_full }}.tar.zst --stdout | tar -xf -
6969

7070
- name: Run selftests
71-
uses: libbpf/ci/run-vmtest@v4
71+
uses: libbpf/ci/run-vmtest@selftests-asan
7272
# https://github.com/actions/runner/issues/1483#issuecomment-1031671517
7373
# booleans are weird in GH.
7474
continue-on-error: ${{ fromJSON(env.CONTINUE_ON_ERROR) }}

.github/workflows/test-progs-asan.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,8 @@ jobs:
3838
env:
3939
ARCH: ${{ inputs.arch }}
4040
ARTIFACTS_ARCHIVE: ${{ github.workspace }}/selftests-bpf-asan-${{ inputs.arch }}-${{ inputs.toolchain_full }}.tar.zst
41-
KERNEL_ORIGIN: ${{ github.repository == 'kernel-patches/bpf-rc' && 'https://github.com/kernel-patches/bpf-rc.git'
42-
|| 'https://github.com/kernel-patches/bpf.git'
43-
}}
44-
KERNEL_REVISION: ${{ inputs.download_sources && 'bpf-next' || github.sha }}
41+
KERNEL_ORIGIN: 'https://github.com/kernel-patches/bpf.git'
42+
KERNEL_REVISION: bpf
4543
REPO_ROOT: ${{ github.workspace }}/src
4644
steps:
4745

@@ -64,7 +62,7 @@ jobs:
6462
repo-root: ${{ env.REPO_ROOT }}
6563

6664
- name: Setup build environment
67-
uses: libbpf/ci/setup-build-env@v4
65+
uses: libbpf/ci/setup-build-env@selftests-asan
6866
with:
6967
arch: ${{ inputs.arch }}
7068
gcc-version: ${{ inputs.gcc_version }}
@@ -80,7 +78,7 @@ jobs:
8078
run: zstd -d -T0 vmlinux-${{ inputs.arch }}-${{ inputs.toolchain_full }}.tar.zst --stdout | tar -xf -
8179

8280
- name: Build selftests/bpf/test_progs with ASAN
83-
uses: libbpf/ci/build-selftests@v4
81+
uses: libbpf/ci/build-selftests@selftests-asan
8482
env:
8583
KBUILD_OUTPUT: ${{ env.REPO_ROOT }}/kbuild-output
8684
SELFTESTS_BPF_ASAN: 'true'
@@ -93,7 +91,7 @@ jobs:
9391

9492
- name: Tar artifacts
9593
id: tar-artifacts
96-
uses: libbpf/ci/tar-artifacts@v4
94+
uses: libbpf/ci/tar-artifacts@selftests-asan
9795
env:
9896
ARCHIVE_BPF_SELFTESTS: 'true'
9997
ARCHIVE_KBUILD_OUTPUT: '' # emptystring means false
@@ -147,7 +145,7 @@ jobs:
147145
run: zstd -d -T0 selftests-bpf-asan-${{ inputs.arch }}-${{ inputs.toolchain_full }}.tar.zst --stdout | tar -xf -
148146

149147
- name: Run selftests
150-
uses: libbpf/ci/run-vmtest@v4
148+
uses: libbpf/ci/run-vmtest@selftests-asan
151149
env:
152150
ARCH: ${{ inputs.arch }}
153151
DEPLOYMENT: ${{ env.DEPLOYMENT }}

0 commit comments

Comments
 (0)