diff --git a/.travis.yml b/.travis.yml index 6a4c2dc9..4cba8e5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,10 +43,7 @@ matrix: script: # kernel 3.10 (frankenized), systemd 219 - sudo ssh default 'rpm -q centos-release kernel systemd' - # FIXME: the following unit tests are skipped (TESTFLAGS=-short): - # 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 localunittest' - sudo ssh default -t 'sudo -i make -C /vagrant localintegration' - 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 diff --git a/libcontainer/integration/template_test.go b/libcontainer/integration/template_test.go index 30503a98..702f918f 100644 --- a/libcontainer/integration/template_test.go +++ b/libcontainer/integration/template_test.go @@ -117,7 +117,7 @@ func newTemplateConfig(rootfs string) *configs.Config { {Type: configs.NEWNET}, }), Cgroups: &configs.Cgroup{ - Path: "integration/test", + Path: "/sys/fs/cgroup/", Resources: &configs.Resources{ MemorySwappiness: nil, Devices: allowedDevices,