Skip to content

docker: uprev logspec to 15d893c - #3191

Merged
nuclearcat merged 1 commit into
kernelci:mainfrom
nuclearcat:logspec-uprev-15d893c
Aug 20, 2026
Merged

docker: uprev logspec to 15d893c#3191
nuclearcat merged 1 commit into
kernelci:mainfrom
nuclearcat:logspec-uprev-15d893c

Conversation

@nuclearcat

Copy link
Copy Markdown
Member

Pulls in kernelci/logspec#29 ("kbuild: preserve generic error excerpts"), merged as 15d893c.

Generic kbuild failures were producing issues with an empty log_excerpt, so the mailed report had nothing between the "Log excerpt" markers:

---
 in arch/x86/include/generated/asm/cpufeaturemasks.h (/tmp/kci/linux/arch/x86/Makefile:269) [logspec:kbuild,kbuild.other]
---

Log excerpt:
=====================================================

=====================================================

(https://lore.kernel.org/all/178711194407.380.4108589457572337694@kernelci.org/, dashboard: https://d.kernelci.org/i/maestro:e019eff33641f280144d13719cbbf59eb379327c)

KbuildGenericError now keeps the full diagnostic line when the failed target appears within it, and falls back to the make failure itself when there is no preceding diagnostic. Verified with this revision installed against kernelci-pipeline logspec_api.py:

excerpt: 00:13:13 make[5]: *** [/tmp/kci/linux/arch/x86/Makefile:269: arch/x86/include/generated/asm/cpufeaturemasks.h] Error 1
excerpt: 04:41:43 cp: cannot create regular file '/tmp/kci/artifacts/build/kselftest/arm64/signal/fake_sigreturn_bad_magic': File exists

370c994..15d893c is that one commit plus its merge, so the uprev carries no other parser changes.

The headless comment line in the same report is a pipeline-side issue, fixed separately in kernelci/kernelci-pipeline#1584.

Pull in kernelci/logspec#29 ("kbuild: preserve generic error excerpts"),
which fixes empty log_excerpt fields for generic kbuild failures.

Before the fix, a failure such as

  make[5]: *** [/tmp/kci/linux/arch/x86/Makefile:269: arch/x86/include/generated/asm/cpufeaturemasks.h] Error 1

produced an issue with an empty excerpt, so the report mailed out had
nothing between the "Log excerpt" markers. KbuildGenericError now keeps
the full diagnostic line when the target appears within it, and falls
back to the make failure itself when no preceding diagnostic exists.

370c994..15d893c:
  de0ad0a kbuild: preserve generic error excerpts
  15d893c Merge pull request kernelci#29 from nuclearcat/fix-kbuild-empty-log-excerpt

Reported-by: kernelci.org bot <bot@kernelci.org>
Link: https://lore.kernel.org/all/178711194407.380.4108589457572337694@kernelci.org/
Signed-off-by: Denys Fedoryshchenko <denys.f@collabora.com>
@nuclearcat
nuclearcat added this pull request to the merge queue Aug 20, 2026
Merged via the queue into kernelci:main with commit f6c1c58 Aug 20, 2026
3 checks passed
@nuclearcat
nuclearcat deleted the logspec-uprev-15d893c branch August 20, 2026 22:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant