diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-03 11:35:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-03 11:35:13 -0700 |
| commit | 3750b35ae2a22e7f7bc0070c5c2dadf1ef437074 (patch) | |
| tree | c5eee413a0cd57375f464084581704fc6bd22b00 /test/e2e/run_memory_test.go | |
| parent | 2a3e3e7f25d9a7bbe5e6f3f35027ccbe6521961f (diff) | |
| parent | 14473270d7af520dae006605ab798ad9db34f184 (diff) | |
| download | podman-3750b35ae2a22e7f7bc0070c5c2dadf1ef437074.tar.gz podman-3750b35ae2a22e7f7bc0070c5c2dadf1ef437074.tar.bz2 podman-3750b35ae2a22e7f7bc0070c5c2dadf1ef437074.zip | |
Merge pull request #1578 from baude/addubuntuci
Add Ubuntu-18.04 to CI testing
Diffstat (limited to 'test/e2e/run_memory_test.go')
| -rw-r--r-- | test/e2e/run_memory_test.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/e2e/run_memory_test.go b/test/e2e/run_memory_test.go index cc2b969a9..d1768138b 100644 --- a/test/e2e/run_memory_test.go +++ b/test/e2e/run_memory_test.go @@ -39,6 +39,9 @@ var _ = Describe("Podman run memory", func() { }) It("podman run memory-reservation test", func() { + if podmanTest.Host.Distribution == "ubuntu" { + Skip("Unable to perform test on Ubuntu distributions due to memory management") + } session := podmanTest.Podman([]string{"run", "--memory-reservation=40m", ALPINE, "cat", "/sys/fs/cgroup/memory/memory.soft_limit_in_bytes"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) |