diff options
| author | Adrian Reber <areber@redhat.com> | 2019-04-26 21:06:23 +0200 |
|---|---|---|
| committer | Adrian Reber <areber@redhat.com> | 2019-05-06 13:02:52 +0200 |
| commit | 76df31830c16d0b2dbbb8622dbc584de256cf874 (patch) | |
| tree | 432c63a2af8dbbf3abdeda8f917e5c04a473ee87 | |
| parent | 5db7b17d79ada6ae69ed2f462188e1b7aa373716 (diff) | |
| download | podman-76df31830c16d0b2dbbb8622dbc584de256cf874.tar.gz podman-76df31830c16d0b2dbbb8622dbc584de256cf874.tar.bz2 podman-76df31830c16d0b2dbbb8622dbc584de256cf874.zip | |
Only run checkpoint/restore tests on Fedora >= 29
Only Fedora 29 and newer has an updated container-selinux and
selinux-policy new enough to support CRIU in restoring threaded
processes in a container with SELinux enabled.
Also skip checkpoint/restore tests if rootless. CRIU requires root.
Signed-off-by: Adrian Reber <areber@redhat.com>
| -rw-r--r-- | test/e2e/checkpoint_test.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go index 5b549755e..c2f5a592c 100644 --- a/test/e2e/checkpoint_test.go +++ b/test/e2e/checkpoint_test.go @@ -21,6 +21,7 @@ var _ = Describe("Podman checkpoint", func() { ) BeforeEach(func() { + SkipIfRootless() tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) @@ -41,11 +42,12 @@ var _ = Describe("Podman checkpoint", func() { if !criu.CheckForCriu() { Skip("CRIU is missing or too old.") } - // TODO: Remove the skip when the current CRIU SELinux problem is solved. - // See: https://github.com/containers/libpod/issues/2334 + // Only Fedora 29 and newer has a new enough selinux-policy and + // container-selinux package to support CRIU in correctly + // restoring threaded processes hostInfo := podmanTest.Host - if hostInfo.Distribution == "fedora" { - Skip("Checkpointing containers on Fedora currently broken.") + if hostInfo.Distribution == "fedora" && hostInfo.Version < "29" { + Skip("Checkpoint/Restore with SELinux only works on Fedora >= 29") } }) |