diff --git a/.travis.yml b/.travis.yml index 3e12b820bfd..84213eadb28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,8 @@ matrix: - sudo ssh default sudo podman build -t test /vagrant # Mounting /lib/modules into the container is necessary as CRIU wants to load (via iptables) additional modules - sudo ssh default sudo podman run --privileged --cgroupns=private -v /lib/modules:/lib/modules:ro test make localunittest + # cgroupv2+systemd: test on vagrant host itself as we need systemd + - sudo ssh default -t 'cd /vagrant && sudo make localintegration RUNC_USE_SYSTEMD=yes' allow_failures: - go: tip diff --git a/Vagrantfile b/Vagrantfile index 165b078018d..aba0c0cd717 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -13,6 +13,12 @@ Vagrant.configure("2") do |config| v.cpus = 2 end config.vm.provision "shell", inline: <<-SHELL - dnf install -y podman + cat << EOF | dnf -y shell +config install_weak_deps: False +update +install podman make golang-go libseccomp-devel bats jq +ts run +EOF + dnf clean all SHELL end diff --git a/tests/integration/events.bats b/tests/integration/events.bats index b3e6315b555..8f2f81a23d0 100644 --- a/tests/integration/events.bats +++ b/tests/integration/events.bats @@ -13,7 +13,8 @@ function teardown() { @test "events --stats" { # XXX: currently cgroups require root containers. - requires root + # TODO: support cgroup v2 memory.events + requires root cgroups_v1 # run busybox detached runc run -d --console-socket $CONSOLE_SOCKET test_busybox @@ -28,7 +29,8 @@ function teardown() { @test "events --interval default " { # XXX: currently cgroups require root containers. - requires root + # TODO: support cgroup v2 memory.events + requires root cgroups_v1 # run busybox detached runc run -d --console-socket $CONSOLE_SOCKET test_busybox @@ -55,7 +57,8 @@ function teardown() { @test "events --interval 1s " { # XXX: currently cgroups require root containers. - requires root + # TODO: support cgroup v2 memory.events + requires root cgroups_v1 # run busybox detached runc run -d --console-socket $CONSOLE_SOCKET test_busybox @@ -81,7 +84,8 @@ function teardown() { @test "events --interval 100ms " { # XXX: currently cgroups require root containers. - requires root + # TODO: support cgroup v2 memory.events + requires root cgroups_v1 # run busybox detached runc run -d --console-socket $CONSOLE_SOCKET test_busybox