diff options
| author | Ed Santiago <santiago@redhat.com> | 2021-05-03 13:41:53 -0600 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2021-05-03 20:15:21 -0600 |
| commit | 9fd7ab50f82c7eaccd2b9daca84e516367f610a2 (patch) | |
| tree | 85df0c24985f6f639aa1c4874d31957adb5a805a /test/system/160-volumes.bats | |
| parent | b01ec314f58941c955a7b6f878ce995ab3239656 (diff) | |
| download | podman-9fd7ab50f82c7eaccd2b9daca84e516367f610a2.tar.gz podman-9fd7ab50f82c7eaccd2b9daca84e516367f610a2.tar.bz2 podman-9fd7ab50f82c7eaccd2b9daca84e516367f610a2.zip | |
System tests: honor $OCI_RUNTIME (for CI)
Some CI systems set $OCI_RUNTIME as a way to override the
default crun. Integration (e2e) tests honor this, but system
tests were not aware of the convention; this means we haven't
been testing system tests with runc, which means RHEL gating
tests are now failing.
The proper solution would be to edit containers.conf on CI
systems. Sorry, that would involve too much CI-VM work.
Instead, this PR detects $OCI_RUNTIME and creates a dummy
containers.conf file using that runtime.
Add: various skips for tests that don't work with runc.
Refactor: add a helper function so we don't need to do
the complicated 'podman info blah blah .OCIRuntime.blah'
thing in many places.
BUG: we leave a tmp file behind on exit.
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/system/160-volumes.bats')
| -rw-r--r-- | test/system/160-volumes.bats | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/system/160-volumes.bats b/test/system/160-volumes.bats index 98992f973..9a852db89 100644 --- a/test/system/160-volumes.bats +++ b/test/system/160-volumes.bats @@ -123,8 +123,7 @@ EOF # ARGH. Unfortunately, runc (used for cgroups v1) produces a different error local expect_rc=126 local expect_msg='.* OCI permission denied.*' - run_podman info --format '{{ .Host.OCIRuntime.Path }}' - if expr "$output" : ".*/runc"; then + if [[ $(podman_runtime) = "runc" ]]; then expect_rc=1 expect_msg='.* exec user process caused.*permission denied' fi |