aboutsummaryrefslogtreecommitdiff
path: root/test/e2e
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2018-09-13 14:12:04 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-09-26 15:47:29 +0000
commit407354198169f33a1ebebca3ae47d5d0c34d9b42 (patch)
tree2c2c5a2d2b91eb21baf3848c83b6a150eb6bbf63 /test/e2e
parentf4e2810fcbc5c602c8d1ffeb4330e224c2ecc0a9 (diff)
downloadpodman-407354198169f33a1ebebca3ae47d5d0c34d9b42.tar.gz
podman-407354198169f33a1ebebca3ae47d5d0c34d9b42.tar.bz2
podman-407354198169f33a1ebebca3ae47d5d0c34d9b42.zip
rework CI tests to test on VMs
This PR makes several key changes to our CI testing. Firstly, we now test podman on fedora 28, fedora 29, and centos VMS (rather than containers). Any of these that having failing tests are not marked as required yet. We still preserve the podman in podman and podman in docker tests as well and they are marked as required. The lint and validate work is now done on a openshift container. We also removed the rpm verification on papr and perform this test under the "images" test on the openshift ci. This PR exposes integration test fails on some of our OSs. My expectation is we will fix those in additional PRs and as they are fixed, we should be flipping the boolean bit to required. Signed-off-by: baude <bbaude@redhat.com> Closes: #1492 Approved by: mheon
Diffstat (limited to 'test/e2e')
-rw-r--r--test/e2e/libpod_suite_test.go2
-rw-r--r--test/e2e/run_test.go4
2 files changed, 3 insertions, 3 deletions
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go
index 88ec6bc19..a1e9ba57a 100644
--- a/test/e2e/libpod_suite_test.go
+++ b/test/e2e/libpod_suite_test.go
@@ -132,7 +132,7 @@ func PodmanCreate(tempDir string) PodmanTest {
podmanBinary = os.Getenv("PODMAN_BINARY")
}
conmonBinary := filepath.Join("/usr/libexec/podman/conmon")
- altConmonBinary := "/usr/libexec/podman/conmon"
+ altConmonBinary := "/usr/libexec/crio/conmon"
if _, err := os.Stat(altConmonBinary); err == nil {
conmonBinary = altConmonBinary
}
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index baaca6333..5cec4f04b 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -50,10 +50,10 @@ var _ = Describe("Podman run", func() {
It("podman run a container based on local image with short options and args", func() {
// regression test for #714
- session := podmanTest.Podman([]string{"run", ALPINE, "find", "/", "-name", "etc"})
+ session := podmanTest.Podman([]string{"run", ALPINE, "find", "/etc", "-name", "hosts"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
- match, _ := session.GrepString("/etc")
+ match, _ := session.GrepString("/etc/hosts")
Expect(match).Should(BeTrue())
})