diff --git a/.travis.yml b/.travis.yml index 3e12b820bfd..84088b87e7f 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 + - sudo ssh default 'cd /vagrant && sudo make localintegration TESTPATH=/update.bats RUNC_USE_SYSTEMD=yes' + - sudo ssh default 'cd /vagrant && sudo make localintegration TESTPATH=/cgroups.bats RUNC_USE_SYSTEMD=yes' allow_failures: - go: tip diff --git a/Vagrantfile b/Vagrantfile index 165b078018d..1649d83e384 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -13,6 +13,6 @@ Vagrant.configure("2") do |config| v.cpus = 2 end config.vm.provision "shell", inline: <<-SHELL - dnf install -y podman + dnf install -y podman git-core make golang-go libseccomp-devel bats jq SHELL end diff --git a/tests/integration/cgroups.bats b/tests/integration/cgroups.bats index 6abb2ed6b02..9d4f923b257 100644 --- a/tests/integration/cgroups.bats +++ b/tests/integration/cgroups.bats @@ -117,6 +117,7 @@ EOF runc run -d --console-socket $CONSOLE_SOCKET test_cgroups_permissions [ "$status" -eq 0 ] + sleep 1 runc exec test_cgroups_permissions echo "cgroups_exec" [ "$status" -eq 0 ] [[ ${lines[0]} == *"cgroups_exec"* ]]