diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-12 16:10:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-12 16:10:37 +0200 |
| commit | 686da0d60c798d175af729ab27023f6a038be08f (patch) | |
| tree | 661fbabcee31737ed70f9c54788f6d630d030641 /contrib/cirrus/lib.sh | |
| parent | 6f3e7f7eccdfed03d3d617a9040d5e0b844ea637 (diff) | |
| parent | dc385fc8b6710d5b935f372ddbd92357df90f153 (diff) | |
| download | podman-686da0d60c798d175af729ab27023f6a038be08f.tar.gz podman-686da0d60c798d175af729ab27023f6a038be08f.tar.bz2 podman-686da0d60c798d175af729ab27023f6a038be08f.zip | |
Merge pull request #3534 from cevich/img_sys_tst
Cirrus: Execute system-tests during image-validation
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 |