diff options
author | Chris Evich <cevich@redhat.com> | 2018-12-10 11:24:57 -0500 |
---|---|---|
committer | Chris Evich <cevich@redhat.com> | 2018-12-14 11:19:41 -0500 |
commit | a1a5f3ba515e54bad3364ab175d86906d0756044 (patch) | |
tree | afccd16e51b6170727ce2a5970f834610adde39e /test/e2e | |
parent | cb89409a712d1419fb5f02fd6812359e960fb1d6 (diff) | |
download | podman-a1a5f3ba515e54bad3364ab175d86906d0756044.tar.gz podman-a1a5f3ba515e54bad3364ab175d86906d0756044.tar.bz2 podman-a1a5f3ba515e54bad3364ab175d86906d0756044.zip |
Cirrus: Migrate PAPR testing of F28 to Cirrus
Since the most recent TWO versions of Fedora are officially supported
upstream, both need to be tested. Implement the concept of a 'prior'
Fedora release in both base-image and cache-image production. Utilize
the produced cache-image to test libpod. Remove F28 testing from PAPR.
Much thanks to @baude @giuseppe for help with this.
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'test/e2e')
-rw-r--r-- | test/e2e/libpod_suite_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index 268db5aa1..d312124ab 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -109,7 +109,7 @@ func PodmanTestCreate(tempDir string) *PodmanTestIntegration { } conmonBinary := filepath.Join("/usr/libexec/podman/conmon") altConmonBinary := "/usr/libexec/crio/conmon" - if _, err := os.Stat(altConmonBinary); err == nil { + if _, err := os.Stat(conmonBinary); os.IsNotExist(err) { conmonBinary = altConmonBinary } if os.Getenv("CONMON_BINARY") != "" { |