diff options
| author | baude <bbaude@redhat.com> | 2018-10-01 12:10:46 -0500 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2018-10-03 12:45:37 -0500 |
| commit | 14473270d7af520dae006605ab798ad9db34f184 (patch) | |
| tree | 3224b4b540df5adccc615f5adede8c3e3db7eb90 /test/e2e/run_memory_test.go | |
| parent | 230edff5216d0a7cedeff06c891450f8691b5aa2 (diff) | |
| download | podman-14473270d7af520dae006605ab798ad9db34f184.tar.gz podman-14473270d7af520dae006605ab798ad9db34f184.tar.bz2 podman-14473270d7af520dae006605ab798ad9db34f184.zip | |
Add ability for ubuntu to be tested
unfortunately the papr CI system cannot test ubuntu as a VM; therefore,
this PR still keeps travis. but it does include fixes that will be required
for running on modern versions of ubuntu.
Signed-off-by: baude <bbaude@redhat.com>
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)) |