opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-02 08:47:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25856 from Luap99/flakes

Browse Source 
Some minor flake cleanup/debugging/skips
This commit is contained in:
openshift-merge-bot[bot]
2025-04-14 11:37:18 +00:00
committed by GitHub
parent 18e20f8c34 a4856a6224
commit 4b148e593f
5 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hack/podman_cleanup_tracer.bt
View File

@ -149,17 +149,3 @@ tracepoint:syscalls:sys_enter_write
$offset += $len $offset += $len
} }
} }
// HACK: debug for https://github.com/containers/podman/issues/23913
// The test uses "ebpf-debug-23913" volume name and because and volume rm
// will delete the path we can trap the process here to find out who actually
// deletes it.
tracepoint:syscalls:sys_enter_unlink*
/ strcontains(str(args.pathname), "ebpf-debug-23913") /
{
printf("Special issue 23913 volume deleted by pid %d: ", pid);
// This can fail to open the file it is done in user space and
// thus racy if the process exits quickly.
cat("/proc/%d/cmdline", pid);
print("");
}

1
test/e2e/checkpoint_test.go
View File

@ -1131,6 +1131,7 @@ var _ = Describe("Podman checkpoint", func() {
) )
It(testName, func() { It(testName, func() {
Skip("FIXME: #24571 - not working an super flaky, don't waste CI time on it")
podName := "test_pod" podName := "test_pod"
if err := criu.CheckForCriu(criu.PodCriuVersion); err != nil { if err := criu.CheckForCriu(criu.PodCriuVersion); err != nil {

1
test/system/220-healthcheck.bats
View File

@ -439,6 +439,7 @@ function _check_health_log {
# Wait for background healthcheck to finish and make sure the exit status is 1 # Wait for background healthcheck to finish and make sure the exit status is 1
rc=0 rc=0
wait -n $hc_pid || rc=$? wait -n $hc_pid || rc=$?
cat $hcStatus # just as debug in case the exit code check fails
assert $rc -eq 1 "exit status check of healthcheck command" assert $rc -eq 1 "exit status check of healthcheck command"
assert $(< $hcStatus) == "stopped" "Health status" assert $(< $hcStatus) == "stopped" "Health status"

5
test/system/520-checkpoint.bats
View File

@ -247,6 +247,11 @@ function setup() {
run_podman inspect $cid --format "{{(index .NetworkSettings.Networks \"$netname\").MacAddress}}" run_podman inspect $cid --format "{{(index .NetworkSettings.Networks \"$netname\").MacAddress}}"
mac1="$output" mac1="$output"
# There is a weird flake, where the hosts content changed after restore and I don't know why.
# Because we start from a /etc/hosts base on the host print that.
echo "hosts file on the host"
cat /etc/hosts
run_podman exec $cid cat /etc/hosts /etc/resolv.conf run_podman exec $cid cat /etc/hosts /etc/resolv.conf
pre_hosts_resolv_conf_output="$output" pre_hosts_resolv_conf_output="$output"

3
test/system/600-completion.bats
View File

@ -270,8 +270,7 @@ function _check_no_suggestions() {
random_image_name="i-$(safename)" random_image_name="i-$(safename)"
random_image_tag=$(random_string 5) random_image_tag=$(random_string 5)
random_network_name="n-$(safename)" random_network_name="n-$(safename)"
# Do not change the suffix, it is special debug for #23913 random_volume_name="v-$(safename)"
random_volume_name="v-$(safename)-ebpf-debug-23913"
random_secret_name="s-$(safename)" random_secret_name="s-$(safename)"
random_secret_content=$(random_string 30) random_secret_content=$(random_string 30)
secret_file=$PODMAN_TMPDIR/$(random_string 10) secret_file=$PODMAN_TMPDIR/$(random_string 10)