Merge pull request #10222 from vrothberg/image-tree

podman image tree: restore previous behavior

3 files changed, 24 insertions, 17 deletions

diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats
index bac153b8e..3dd88e5eb 100644
--- a/test/system/035-logs.bats
+++ b/test/system/035-logs.bats
@@ -27,13 +27,22 @@ load helpers
     run_podman rm $cid
 }
 
-@test "podman logs - multi" {
+function _log_test_multi() {
+    local driver=$1
+
     skip_if_remote "logs does not support multiple containers when run remotely"
 
+    # Under k8s file, 'podman logs' returns just the facts, Ma'am.
+    # Under journald, there may be other cruft (e.g. container removals)
+    local etc=
+    if [[ $driver =~ journal ]]; then
+        etc='.*'
+    fi
+
     # Simple helper to make the container starts, below, easier to read
     local -a cid
     doit() {
-        run_podman run --rm -d --name "$1" $IMAGE sh -c "$2";
+        run_podman run --log-driver=$driver --rm -d --name "$1" $IMAGE sh -c "$2";
         cid+=($(echo "${output:0:12}"))
     }
 
@@ -47,24 +56,21 @@ load helpers
 
     run_podman logs -f c1 c2
     is "$output" \
-       "${cid[0]} a
-${cid[1]} b
-${cid[1]} c
+       "${cid[0]} a$etc
+${cid[1]} b$etc
+${cid[1]} c$etc
 ${cid[0]} d"   "Sequential output from logs"
 }
 
-@test "podman logs over journald" {
+@test "podman logs - multi k8s-file" {
+    _log_test_multi k8s-file
+}
+
+@test "podman logs - multi journald" {
     # We can't use journald on RHEL as rootless: rhbz#1895105
     skip_if_journald_unavailable
 
-    msg=$(random_string 20)
-
-    run_podman run --name myctr --log-driver journald $IMAGE echo $msg
-
-    run_podman logs myctr
-    is "$output" "$msg" "check that log output equals the container output"
-
-    run_podman rm myctr
+    _log_test_multi journald
 }
 
 # vim: filetype=sh
diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index a2c8ae588..d2d56c051 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -393,9 +393,9 @@ Labels.$label_name | $label_value
        "image tree: third line"
     is "${lines[3]}" "Image Layers" \
        "image tree: fourth line"
-    is "${lines[4]}"  ".* ID: [0-9a-f]\{12\} Size: .* Top Layer of: \[localhost/build_test:latest]" \
+    is "${lines[4]}" ".* ID: [0-9a-f]\{12\} Size: .* Top Layer of: \[$IMAGE]" \
        "image tree: first layer line"
-    is "${lines[-1]}" ".* ID: [0-9a-f]\{12\} Size: .* Top Layer of: \[$IMAGE]" \
+    is "${lines[-1]}"  ".* ID: [0-9a-f]\{12\} Size: .* Top Layer of: \[localhost/build_test:latest]" \
        "image tree: last layer line"
 
     # FIXME: 'image tree --whatrequires' does not work via remote
diff --git a/test/system/130-kill.bats b/test/system/130-kill.bats
index 3770eac27..1b02b4976 100644
--- a/test/system/130-kill.bats
+++ b/test/system/130-kill.bats
@@ -8,7 +8,8 @@ load helpers
 @test "podman kill - test signal handling in containers" {
     # Start a container that will handle all signals by emitting 'got: N'
     local -a signals=(1 2 3 4 5 6 8 10 12 13 14 15 16 20 21 22 23 24 25 26 64)
-    run_podman run -d $IMAGE sh -c \
+    # Force the k8s-file driver until #10323 is fixed.
+    run_podman run --log-driver=k8s-file -d $IMAGE sh -c \
         "for i in ${signals[*]}; do trap \"echo got: \$i\" \$i; done;
         echo READY;
         while ! test -e /stop; do sleep 0.05; done;