diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-02 00:05:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-02 00:05:07 +0200 |
| commit | 9ab6449e36792734853eb59161ccd3bfe5d0d509 (patch) | |
| tree | 4232e3ed14ebc7d8c4de2fef9674900e7ec57895 /test | |
| parent | 475cac4432a72052a000e9be91cd721d03e01eb8 (diff) | |
| parent | 64eb079415eaae5a222b7c4cd114218b28bd6638 (diff) | |
| download | podman-9ab6449e36792734853eb59161ccd3bfe5d0d509.tar.gz podman-9ab6449e36792734853eb59161ccd3bfe5d0d509.tar.bz2 podman-9ab6449e36792734853eb59161ccd3bfe5d0d509.zip | |
Merge pull request #15587 from edsantiago/skip_ubuntu_flake
CI: disable flaking test on ubuntu
Diffstat (limited to 'test')
| -rw-r--r-- | test/system/250-systemd.bats | 5 | ||||
| -rw-r--r-- | test/system/710-kube.bats | 11 |
2 files changed, 5 insertions, 11 deletions
diff --git a/test/system/250-systemd.bats b/test/system/250-systemd.bats index 9a91501dd..8f4471f91 100644 --- a/test/system/250-systemd.bats +++ b/test/system/250-systemd.bats @@ -73,6 +73,11 @@ function service_cleanup() { # These tests can fail in dev. environment because of SELinux. # quick fix: chcon -t container_runtime_exec_t ./bin/podman @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) # See #7407 for --pull=always. run_podman create --pull=always --name $cname --label "io.containers.autoupdate=registry" $IMAGE \ diff --git a/test/system/710-kube.bats b/test/system/710-kube.bats index 58e42148a..c446ff65f 100644 --- a/test/system/710-kube.bats +++ b/test/system/710-kube.bats @@ -78,11 +78,6 @@ status | = | null assert "$actual" $op "$expect" ".$key" 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 } @@ -157,12 +152,6 @@ status | = | {} assert "$actual" $op "$expect" ".$key" 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 pod rm $pname run_podman rmi $(pause_image) |