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/260-sdnotify.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/260-sdnotify.bats')
| -rw-r--r-- | test/system/260-sdnotify.bats | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/system/260-sdnotify.bats b/test/system/260-sdnotify.bats index 8bf49eb1d..acb30de47 100644 --- a/test/system/260-sdnotify.bats +++ b/test/system/260-sdnotify.bats @@ -17,9 +17,9 @@ function setup() { # sdnotify fails with runc 1.0.0-3-dev2 on Ubuntu. Let's just # assume that we work only with crun, nothing else. - run_podman info --format '{{ .Host.OCIRuntime.Name }}' - if [[ "$output" != "crun" ]]; then - skip "this test only works with crun, not '$output'" + runtime=$(podman_runtime) + if [[ "$runtime" != "crun" ]]; then + skip "this test only works with crun, not $runtime" fi basic_setup |