diff options
| author | Chris Evich <cevich@redhat.com> | 2019-07-09 12:06:51 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-07-12 08:44:27 -0400 |
| commit | 9043b816d47e4b88255f8aee8980832766f99283 (patch) | |
| tree | 9e90a2ec0105d3d7d49483c605817c8c48ba6985 /contrib/cirrus/check_image.sh | |
| parent | 6f3e7f7eccdfed03d3d617a9040d5e0b844ea637 (diff) | |
| download | podman-9043b816d47e4b88255f8aee8980832766f99283.tar.gz podman-9043b816d47e4b88255f8aee8980832766f99283.tar.bz2 podman-9043b816d47e4b88255f8aee8980832766f99283.zip | |
Cirrus: Fix missing removal of packaged podman
This was originally intended, but somehow omitted from #1936
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/check_image.sh')
| -rwxr-xr-x | contrib/cirrus/check_image.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/cirrus/check_image.sh b/contrib/cirrus/check_image.sh index 948039234..67e807d61 100755 --- a/contrib/cirrus/check_image.sh +++ b/contrib/cirrus/check_image.sh @@ -16,7 +16,9 @@ MIN_MEM_MB=2000 read JUNK TOTAL USED MEM_FREE JUNK <<<$(free -tm | tail -1) item_test 'Minimum available memory' $MEM_FREE -ge $MIN_MEM_MB || let "RET+=1" -item_test "podman command NOT found on path" -z "$(type -P podman)" || let "RET+=1" +# We're testing a custom-built podman; make sure there isn't a distro-provided +# binary anywhere; that could potentially taint our results. +item_test "remove_packaged_podman_files() did it's job" -z "$(type -P podman)" || let "RET+=1" MIN_ZIP_VER='3.0' VER_RE='.+([[:digit:]]+\.[[:digit:]]+).+' |