Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

temporarily disable CRIU tests #2198

Merged
merged 2 commits into from Jan 14, 2020
Merged

temporarily disable CRIU tests #2198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c20ea1
fix merging #2177 and #2169
AkihiroSuda Jan 14, 2020
55f8c25
temporarily disable CRIU tests
AkihiroSuda Jan 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions libcontainer/cgroups/fs2/fs2.go
View file
Open in desktop
Expand Up @@ -205,5 +205,10 @@ func (m *manager) Set(container *configs.Config) error {
if len(errs) > 0 && !m.rootless {
return errors.Errorf("error while setting cgroup v2: %+v", errs)
}
m.config = container.Cgroups
return nil
}

func (m *manager) GetCgroups() (*configs.Cgroup, error) {
return m.config, nil
}
2 changes: 2 additions & 0 deletions libcontainer/integration/checkpoint_test.go
View file
Open in desktop
Expand Up @@ -42,6 +42,7 @@ func showFile(t *testing.T, fname string) error {
}

func TestUsernsCheckpoint(t *testing.T) {
t.Skip("Ubuntu kernel is broken to run criu (#2196, #2198)")
if _, err := os.Stat("/proc/self/ns/user"); os.IsNotExist(err) {
t.Skip("userns is unsupported")
}
Expand All @@ -53,6 +54,7 @@ func TestUsernsCheckpoint(t *testing.T) {
}

func TestCheckpoint(t *testing.T) {
t.Skip("Ubuntu kernel is broken to run criu (#2196, #2198)")
testCheckpoint(t, false)
}

Expand Down