Merge pull request containers#17344 from openshift-cherrypick-robot/c…

…herry-pick-17327-to-v4.4

[v4.4] system tests: fix volume exec/noexec test

test/system/160-volumes.bats

@@ -178,13 +178,8 @@ EOF
 
     # By default, volumes are mounted exec, but we have manually added the
     # noexec option. This should fail.
-    # ARGH. Unfortunately, runc (used for cgroups v1) has different exit status
-    local expect_rc=126
-    if [[ $(podman_runtime) = "runc" ]]; then
-        expect_rc=1
-    fi
+    run_podman 126 run --rm --volume $myvolume:/vol:noexec,z $IMAGE /vol/myscript
 
-    run_podman ${expect_rc} run --rm --volume $myvolume:/vol:noexec,z $IMAGE /vol/myscript
     # crun and runc emit different messages, and even runc is inconsistent
     # with itself (output changed some time in 2022?). Deal with all.
     assert "$output" =~ 'exec.* permission denied' "run on volume, noexec"