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/lib.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/lib.sh')
| -rw-r--r-- | contrib/cirrus/lib.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index ea0f9e326..b2fcaa749 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -323,8 +323,15 @@ install_test_configs(){ /etc/containers/registries.conf } +# Remove all files (except conmon, for now) provided by the distro version of podman. +# Except conmon, for now as it's expected to eventually be packaged separately. +# All VM cache-images used for testing include the distro podman because (1) it's +# required for podman-in-podman testing and (2) it somewhat simplifies the task +# of pulling in necessary prerequisites packages as the set can change over time. +# For general CI testing however, calling this function makes sure the system +# can only run the compiled source version. remove_packaged_podman_files(){ - show_and_store_warning "Removing packaged podman files to prevent conflicts with source build and testing." + echo "Removing packaged podman files to prevent conflicts with source build and testing." req_env_var OS_RELEASE_ID if [[ "$OS_RELEASE_ID" =~ "ubuntu" ]] then |