summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2019-08-27 16:47:24 -0400
committerMatthew Heon <matthew.heon@pm.me>2019-08-28 09:28:49 -0400
commitca0dfca5c9958c4aa4963f84c69bc425c078a970 (patch)
treec7e4849c80195a8485bbdbfce68ec3baf606f9e1
parent63d989a3449050e8cf0a168145baa512e7493772 (diff)
downloadpodman-ca0dfca5c9958c4aa4963f84c69bc425c078a970.tar.gz
podman-ca0dfca5c9958c4aa4963f84c69bc425c078a970.tar.bz2
podman-ca0dfca5c9958c4aa4963f84c69bc425c078a970.zip
Temporarily disable systemd test for CGroups V2
Revert this one CGroups V2 support for systemd containers is added. Signed-off-by: Matthew Heon <mheon@redhat.com>
-rw-r--r--test/e2e/systemd_test.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go
index 994e99cec..02778d493 100644
--- a/test/e2e/systemd_test.go
+++ b/test/e2e/systemd_test.go
@@ -8,6 +8,7 @@ import (
"strings"
"time"
+ "github.com/containers/libpod/pkg/cgroups"
. "github.com/containers/libpod/test/utils"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
@@ -81,6 +82,12 @@ WantedBy=multi-user.target
})
It("podman run container with systemd PID1", func() {
+ cgroupsv2, err := cgroups.IsCgroup2UnifiedMode()
+ Expect(err).To(BeNil())
+ if cgroupsv2 {
+ Skip("systemd test does not work in cgroups V2 mode yet")
+ }
+
systemdImage := "fedora"
pull := podmanTest.Podman([]string{"pull", systemdImage})
pull.WaitWithDefaultTimeout()