Skip to content

Commit b1faf04

Browse files
committed
ci: ignore kprobe_multi test failures on arm64
Seems like the new CI arm64 kernels doesn't have the necessary config to support kprobe_multi. Ignore the error until we figure out what to do. Updates #1460 Signed-off-by: Lorenz Bauer <[email protected]>
1 parent 65a17a9 commit b1faf04

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

.github/workflows/ci.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ jobs:
142142
runs-on: actuated-arm64-2cpu-8gb
143143
needs: build-and-lint
144144
timeout-minutes: 15
145+
env:
146+
EBPF_TEST_IGNORE_KERNEL_VERSION: 'TestKprobeMulti,TestKprobeMultiErrors,TestKprobeMultiCookie,TestKprobeMultiProgramCall,TestHaveBPFLinkKprobeMulti'
145147
steps:
146148
- uses: actions/checkout@v4
147149

@@ -153,7 +155,7 @@ jobs:
153155
- run: go install gotest.tools/[email protected]
154156

155157
- name: Test
156-
run: gotestsum --ignore-non-json-output-lines --junitfile junit.xml -- -exec sudo -short -count 1 -json ./...
158+
run: gotestsum --ignore-non-json-output-lines --junitfile junit.xml -- -exec 'sudo -E' -short -count 1 -json ./...
157159

158160
- name: Benchmark
159161
run: go test -exec sudo -short -run '^$' -bench . -benchtime=1x ./...

internal/testutils/feature.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,7 @@ func checkFeatureTestError(t *testing.T, err error) {
2424

2525
var ufe *internal.UnsupportedFeatureError
2626
if errors.As(err, &ufe) {
27-
if ignoreKernelVersionCheck(t.Name()) {
28-
t.Skipf("Ignoring error due to %s: %s", ignoreKernelVersionEnvVar, ufe.Error())
29-
} else {
30-
checkKernelVersion(t, ufe)
31-
}
27+
checkKernelVersion(t, ufe)
3228
} else {
3329
t.Error("Feature test failed:", err)
3430
}
@@ -66,8 +62,13 @@ func checkKernelVersion(tb testing.TB, ufe *internal.UnsupportedFeatureError) {
6662
return
6763
}
6864

65+
tb.Helper()
66+
67+
if ignoreKernelVersionCheck(tb.Name()) {
68+
tb.Skipf("Ignoring error due to %s: %s", ignoreKernelVersionEnvVar, ufe.Error())
69+
}
70+
6971
if !isKernelLessThan(tb, ufe.MinimumVersion) {
70-
tb.Helper()
7172
tb.Fatalf("Feature '%s' isn't supported even though kernel is newer than %s",
7273
ufe.Name, ufe.MinimumVersion)
7374
}

0 commit comments

Comments
 (0)