opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-19 16:33:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2705 from adrianreber/ci-test

Browse Source 
Enabling checkpoint/restore testing on Fedora >= 29 again
This commit is contained in:
OpenShift Merge Robot
2019-05-13 15:58:39 +02:00
committed by GitHub
parent d2571c7fd4 5e6ce93b1e
commit 2ded1f6199
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/cirrus/setup_environment.sh
View File

@ -55,6 +55,8 @@ then
CON_SEL="https://kojipkgs.fedoraproject.org/packages/container-selinux/2.100/1.git3b78187.fc29/noarch/container-selinux-2.100-1.git3b78187.fc29.noarch.rpm" CON_SEL="https://kojipkgs.fedoraproject.org/packages/container-selinux/2.100/1.git3b78187.fc29/noarch/container-selinux-2.100-1.git3b78187.fc29.noarch.rpm"
echo ">>>>> OVERRIDING container-selinux WITH $CON_SEL <<<<<" echo ">>>>> OVERRIDING container-selinux WITH $CON_SEL <<<<<"
dnf -y install $CON_SEL dnf -y install $CON_SEL
echo ">>>>> OVERRIDING criu and selinux-policy with latest package <<<<<"
dnf -y upgrade criu selinux-policy
;& # Continue to the next item ;& # Continue to the next item
fedora-28) fedora-28)
echo ">>>>> OVERRIDING source-built runc with latest package <<<<<" echo ">>>>> OVERRIDING source-built runc with latest package <<<<<"

10
test/e2e/checkpoint_test.go
View File

@ -21,6 +21,7 @@ var _ = Describe("Podman checkpoint", func() {
) )
BeforeEach(func() { BeforeEach(func() {
SkipIfRootless()
tempdir, err = CreateTempDirInTempDir() tempdir, err = CreateTempDirInTempDir()
if err != nil { if err != nil {
os.Exit(1) os.Exit(1)
@ -41,11 +42,12 @@ var _ = Describe("Podman checkpoint", func() {
if !criu.CheckForCriu() { if !criu.CheckForCriu() {
Skip("CRIU is missing or too old.") Skip("CRIU is missing or too old.")
} }
// TODO: Remove the skip when the current CRIU SELinux problem is solved. // Only Fedora 29 and newer has a new enough selinux-policy and
// See: https://github.com/containers/libpod/issues/2334 // container-selinux package to support CRIU in correctly
// restoring threaded processes
hostInfo := podmanTest.Host hostInfo := podmanTest.Host
if hostInfo.Distribution == "fedora" { if hostInfo.Distribution == "fedora" && hostInfo.Version < "29" {
Skip("Checkpointing containers on Fedora currently broken.") Skip("Checkpoint/Restore with SELinux only works on Fedora >= 29")
} }
}) })