opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 18:59:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15587 from edsantiago/skip_ubuntu_flake

Browse Source 
CI: disable flaking test on ubuntu
This commit is contained in:
OpenShift Merge Robot
2022-09-02 00:05:07 +02:00
committed by GitHub
parent 475cac4432 64eb079415
commit 9ab6449e36
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/system/250-systemd.bats
View File

@ -73,6 +73,11 @@ function service_cleanup() {
# These tests can fail in dev. environment because of SELinux. # These tests can fail in dev. environment because of SELinux.
# quick fix: chcon -t container_runtime_exec_t ./bin/podman # quick fix: chcon -t container_runtime_exec_t ./bin/podman
@test "podman generate - systemd - basic" { @test "podman generate - systemd - basic" {
# Flakes with "ActiveState=failed (expected =inactive)"
if is_ubuntu; then
skip "FIXME: 2022-09-01: requires conmon-2.1.4, ubuntu has 2.1.3"
fi
cname=$(random_string) cname=$(random_string)
# See #7407 for --pull=always. # See #7407 for --pull=always.
run_podman create --pull=always --name $cname --label "io.containers.autoupdate=registry" $IMAGE \ run_podman create --pull=always --name $cname --label "io.containers.autoupdate=registry" $IMAGE \

11
test/system/710-kube.bats
View File

@ -78,11 +78,6 @@ status | = | null
assert "$actual" $op "$expect" ".$key" assert "$actual" $op "$expect" ".$key"
done < <(parse_table "$expect") done < <(parse_table "$expect")
if ! is_remote; then
count=$(egrep -c "$kubernetes_63" <<<"$output")
assert "$count" = 1 "1 instance of the Kubernetes-63-char warning"
fi
run_podman rm $cname run_podman rm $cname
} }
@ -157,12 +152,6 @@ status | = | {}
assert "$actual" $op "$expect" ".$key" assert "$actual" $op "$expect" ".$key"
done < <(parse_table "$expect") done < <(parse_table "$expect")
# Why 4? Maybe two for each container?
if ! is_remote; then
count=$(egrep -c "$kubernetes_63" <<<"$output")
assert "$count" = 4 "instances of the Kubernetes-63-char warning"
fi
run_podman rm $cname1 $cname2 run_podman rm $cname1 $cname2
run_podman pod rm $pname run_podman pod rm $pname
run_podman rmi $(pause_image) run_podman rmi $(pause_image)