From 84583eb1a4a5a53ca79bba32eb67592c26c25704 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Fri, 3 Apr 2020 23:12:43 -0700
Subject: [PATCH] Enable integration tests in cgroupv2 env

Those needs to be run on the (Vagrant Fedora 31) host
(since we need real systemd running), and so we have
to have all the tools needed to compile runc and run
the tests.

The good news is Fedora packages a decent and recent release
of bats-core (1.1.0), which we can use (Debian does not),
and we can also use golang (currently 1.13.9) from Fedora.

The bad news are

 1. Currently cgroups tests are only working with
    RUNC_USE_SYSTEMD=yes (addressed by #2299, #2305)

 2. Tests in events.bats do not work (need cgroupv2
    memory.events support)

 3. Fedora 31 image is 6 months old (and has broken
    container-selinux policy) so we need `dnf update`,
    which adds ~5 min to test time.

[v2: add -t to ssh to enforce pty]
[v3: disable events tests for cgroupv2]
[v4: update fedora packages, use a single dnf transation]

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 .travis.yml                   |  2 ++
 Vagrantfile                   |  8 +++++++-
 tests/integration/events.bats | 12 ++++++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3e12b820..84213ead 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 165b0780..aba0c0cd 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 b3e6315b..8f2f81a2 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