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/setup_environment.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/setup_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index f312e593a..e49bb98fe 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -52,7 +52,9 @@ install_test_configs make install.tools case "$SPECIALMODE" in - none) ;; # Do the normal thing + none) + remove_packaged_podman_files # we're building from source + ;; rootless) # Only do this once, even if ROOTLESS_USER (somehow) changes if ! grep -q 'ROOTLESS_USER' /etc/environment @@ -65,9 +67,9 @@ case "$SPECIALMODE" in tee -a /etc/environment) && eval "$X" && echo "$X" setup_rootless fi + remove_packaged_podman_files ;; in_podman) # Assumed to be Fedora - dnf install -y podman $SCRIPT_BASE/setup_container_environment.sh ;; windows) ;& # for podman-remote building only |