Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix conflict on heredoc temp files #5721

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Fix conflict on heredoc temp files

aba0beb
Select commit
Loading
Failed to load commit list.
Open

Fix conflict on heredoc temp files #5721

Fix conflict on heredoc temp files
aba0beb
Select commit
Loading
Failed to load commit list.
Cirrus CI / Debian Conformance w/ overlay failed Nov 21, 2024 in 15m 44s

Task Summary

Instruction conformance_test failed in 14:56

Details

✅ 00:06 clone
✅ 00:40 setup
❌ 14:56 conformance_test

[+0893s] === RUN   TestCommit/user_just_config
[+0894s] === RUN   TestCommit/user_with_conflict
[+0894s] === RUN   TestCommit/volume_just_changes
[+0894s] === RUN   TestCommit/volume_just_config
[+0895s] === RUN   TestCommit/volume_union
[+0895s] === RUN   TestCommit/workdir_just_changes
[+0895s] === RUN   TestCommit/workdir_just_config
[+0896s] === RUN   TestCommit/workdir_with_conflict
[+0896s] --- PASS: TestCommit (15.09s)
[+0896s]     --- PASS: TestCommit/defaults (2.78s)
[+0896s]     --- PASS: TestCommit/empty_change (0.31s)
[+0896s]     --- PASS: TestCommit/empty_config (0.31s)
[+0896s]     --- PASS: TestCommit/cmd_just_changes (0.32s)
[+0896s]     --- PASS: TestCommit/cmd_just_config (0.30s)
[+0896s]     --- PASS: TestCommit/cmd_conflict (0.31s)
[+0896s]     --- PASS: TestCommit/entrypoint_just_changes (0.33s)
[+0896s]     --- PASS: TestCommit/entrypoint_just_config (0.33s)
[+0896s]     --- PASS: TestCommit/entrypoint_conflict (0.31s)
[+0896s]     --- PASS: TestCommit/environment_just_changes (0.30s)
[+0896s]     --- PASS: TestCommit/environment_just_config (0.32s)
[+0896s]     --- PASS: TestCommit/environment_with_conflict_union (0.32s)
[+0896s]     --- PASS: TestCommit/expose_just_changes (0.32s)
[+0896s]     --- PASS: TestCommit/expose_just_config (0.31s)
[+0896s]     --- PASS: TestCommit/expose_union (0.32s)
[+0896s]     --- PASS: TestCommit/healthcheck_just_changes (0.31s)
[+0896s]     --- PASS: TestCommit/healthcheck_just_config (0.31s)
[+0896s]     --- PASS: TestCommit/healthcheck_conflict (0.31s)
[+0896s]     --- PASS: TestCommit/label_just_changes (0.31s)
[+0896s]     --- PASS: TestCommit/label_just_config (0.31s)
[+0896s]     --- PASS: TestCommit/label_with_conflict_union (0.31s)
[+0896s]     --- PASS: TestCommit/onbuild_just_changes (0.41s)
[+0896s]     --- PASS: TestCommit/onbuild_just_config (0.42s)
[+0896s]     --- PASS: TestCommit/onbuild_conflict (0.41s)
[+0896s]     --- PASS: TestCommit/shell_just_config (0.30s)
[+0896s]     --- PASS: TestCommit/stop_signal_conflict (0.34s)
[+0896s]     --- PASS: TestCommit/stop_timeout=0 (0.31s)
[+0896s]     --- PASS: TestCommit/stop_timeout=15 (0.31s)
[+0896s]     --- PASS: TestCommit/stop_timeout=15,_then_0 (0.40s)
[+0896s]     --- PASS: TestCommit/stop_timeout=0,_then_15 (0.40s)
[+0896s]     --- PASS: TestCommit/user_just_changes (0.31s)
[+0896s]     --- PASS: TestCommit/user_just_config (0.29s)
[+0896s]     --- PASS: TestCommit/user_with_conflict (0.30s)
[+0896s]     --- PASS: TestCommit/volume_just_changes (0.30s)
[+0896s]     --- PASS: TestCommit/volume_just_config (0.32s)
[+0896s]     --- PASS: TestCommit/volume_union (0.30s)
[+0896s]     --- PASS: TestCommit/workdir_just_changes (0.30s)
[+0896s]     --- PASS: TestCommit/workdir_just_config (0.30s)
[+0896s]     --- PASS: TestCommit/workdir_with_conflict (0.30s)
[+0896s] FAIL
[+0896s] coverage: 66.7% of statements
[+0896s] FAIL	github.com/containers/buildah/tests/conformance	618.719s
[+0896s] FAIL
[+0896s] make: *** [Makefile:184: test-conformance] Error 1
[22:22:48] END - [+0896s] total duration since START

Exit status: 2