Merge pull request #8174 from rhatdan/errors

Podman often reports OCI Runtime does not exist, even if it does
This commit is contained in:
OpenShift Merge Robot
2020-10-29 22:21:17 +01:00
committed by GitHub
3 changed files with 6 additions and 6 deletions

View File

@@ -14,8 +14,8 @@ load helpers
# ...but check the configured runtime engine, and switch to crun as needed
run_podman info --format '{{ .Host.OCIRuntime.Path }}'
if expr "$output" : ".*/crun"; then
err_no_such_cmd="Error: executable file.* not found in \$PATH: No such file or directory: OCI runtime command not found error"
err_no_exec_dir="Error: open executable: Operation not permitted: OCI runtime permission denied error"
err_no_such_cmd="Error: executable file.* not found in \$PATH: No such file or directory: OCI not found"
err_no_exec_dir="Error: open executable: Operation not permitted: OCI permission denied"
fi
tests="

View File

@@ -119,7 +119,7 @@ EOF
# noexec option. This should fail.
# ARGH. Unfortunately, runc (used for cgroups v1) produces a different error
local expect_rc=126
local expect_msg='.* OCI runtime permission denied.*'
local expect_msg='.* OCI permission denied.*'
run_podman info --format '{{ .Host.OCIRuntime.Path }}'
if expr "$output" : ".*/runc"; then
expect_rc=1