diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-08-18 14:41:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-18 14:41:15 -0400 |
| commit | 4ec227079011faef53e22b868d475a831b1f9e89 (patch) | |
| tree | c284fb692d70cb9e490b150814ad0e1a91bd595a /test/e2e/common_test.go | |
| parent | a3d8b48fd56a722642f7cbcad52b2fa88f12b656 (diff) | |
| parent | 9dd088e555870c6bf149f9d83a5095880580a56a (diff) | |
| download | podman-4ec227079011faef53e22b868d475a831b1f9e89.tar.gz podman-4ec227079011faef53e22b868d475a831b1f9e89.tar.bz2 podman-4ec227079011faef53e22b868d475a831b1f9e89.zip | |
Merge pull request #10829 from cevich/update_images
Update images
Diffstat (limited to 'test/e2e/common_test.go')
| -rw-r--r-- | test/e2e/common_test.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 2e48e1763..d03a2741b 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -645,9 +645,13 @@ func isRootless() bool { return os.Geteuid() != 0 } +func isCgroupsV1() bool { + return !CGROUPSV2 +} + func SkipIfCgroupV1(reason string) { checkReason(reason) - if !CGROUPSV2 { + if isCgroupsV1() { Skip(reason) } } |