jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2501 from XiaodongLoong/systemderror-fix 

fix TestPidsSystemd and TestRunWithKernelMemorySystemd test error
This commit is contained in:
Kir Kolyshkin 2020-07-08 20:39:39 -07:00 committed by GitHub
parent ce54a9d4d7 f57bb2fe3d
commit fbf047bf2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -43,10 +43,7 @@ matrix:
script: script:
# kernel 3.10 (frankenized), systemd 219 # kernel 3.10 (frankenized), systemd 219
- sudo ssh default 'rpm -q centos-release kernel systemd' - sudo ssh default 'rpm -q centos-release kernel systemd'
# FIXME: the following unit tests are skipped (TESTFLAGS=-short): - sudo ssh default -t 'sudo -i make -C /vagrant localunittest'
# FAIL: TestPidsSystemd: utils_test.go:55: exec_test.go:630: unexpected error: container_linux.go:353: starting container process caused: process_linux.go:326: applying cgroup configuration for process caused: mountpoint for devices not found
# FAIL: TestRunWithKernelMemorySystemd: exec_test.go:713: runContainer failed with kernel memory limit: container_linux.go:353: starting container process caused: process_linux.go:326: applying cgroup configuration for process caused: mkdir : no such file or directory
- sudo ssh default -t 'sudo -i make -C /vagrant localunittest TESTFLAGS=-short'
- sudo ssh default -t 'sudo -i make -C /vagrant localintegration' - sudo ssh default -t 'sudo -i make -C /vagrant localintegration'
- sudo ssh default -t 'sudo -i make -C /vagrant localintegration RUNC_USE_SYSTEMD=1' - sudo ssh default -t 'sudo -i make -C /vagrant localintegration RUNC_USE_SYSTEMD=1'
# FIXME: rootless is skipped because of EPERM on writing cgroup.procs # FIXME: rootless is skipped because of EPERM on writing cgroup.procs

2
libcontainer/integration/template_test.go
View File

@ -117,7 +117,7 @@ func newTemplateConfig(rootfs string) *configs.Config {
{Type: configs.NEWNET}, {Type: configs.NEWNET},
}), }),
Cgroups: &configs.Cgroup{ Cgroups: &configs.Cgroup{
Path: "integration/test", Path: "/sys/fs/cgroup/",
Resources: &configs.Resources{ Resources: &configs.Resources{
MemorySwappiness: nil, MemorySwappiness: nil,
Devices: allowedDevices, Devices: allowedDevices,