Skip to content

Commit 6004be4

Browse files
committed
fixup! tests: dump node-side diagnostics when kata-deploy install fails
The dm-verity rule matched any mention of dmverity, and containerd's own config dump always contains dmverity_mode, so every failure was reported as a dm-verity suspect on top of the real one. Match the messages that only appear when dm-verity actually fails instead. Signed-off-by: Saul Paredes <saulparedes@microsoft.com>
1 parent e00ff4b commit 6004be4

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

tests/gha-run-k8s-common.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,8 @@ function kata_deploy_failure_verdict() {
791791
matched=1
792792
fi
793793

794-
if sudo grep -qiE 'dmverity|dm-verity' "${journal}" "${configdump}" "${podlog}" 2>/dev/null; then
794+
if sudo grep -qiE 'invalid dmverity_mode|dmverity_mode is .on. but|dm-verity support check failed|dm-verity is not supported|EROFS_DMVERITY requires' \
795+
"${journal}" "${configdump}" "${podlog}" 2>/dev/null; then
795796
echo "SUSPECT 5474f95e04 / 94f673a615 (dm-verity keys written on every path)"
796797
echo " -> dmverity_mode/enable_dmverity are written even with erofsDmverity=false."
797798
matched=1

0 commit comments

Comments
 (0)