containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix upgrade tests assuming storage.conf exists 

On F36 / podman 4, at the time of this commit there is no
`/etc/containers/storage.conf` installed by default.  Since the
test volume-mounts this file into the container, it was failing.  Fix
this by using a conditional volume-mount based on the file existing (or
not).

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich 2022-04-08 10:29:38 -04:00
parent cb09c26c65
commit d24507c1ec
No known key found for this signature in database
GPG Key ID: 03EDC70FD578067F
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/upgrade/test-upgrade.bats
View File

@ -146,6 +146,12 @@ EOF
# cause connectivity issues since cni and netavark should never be mixed. # cause connectivity issues since cni and netavark should never be mixed.
mkdir -p /run/netns /run/cni /run/containers /var/lib/cni /etc/cni/net.d mkdir -p /run/netns /run/cni /run/containers /var/lib/cni /etc/cni/net.d
# Containers-common around release 1-55 no-longer supplies this file
sconf=/etc/containers/storage.conf
v_sconf=
if [[ -e "$sconf" ]]; then
v_sconf="-v $sconf:$sconf"
fi
# #
# Use new-podman to run the above script under old-podman. # Use new-podman to run the above script under old-podman.
@ -165,7 +171,7 @@ EOF
--net=host \ --net=host \
--cgroupns=host \ --cgroupns=host \
--pid=host \ --pid=host \
-v /etc/containers/storage.conf:/etc/containers/storage.conf \ $v_sconf \
-v /dev/fuse:/dev/fuse \ -v /dev/fuse:/dev/fuse \
-v /run/crun:/run/crun \ -v /run/crun:/run/crun \
-v /run/netns:/run/netns:rshared \ -v /run/netns:/run/netns:rshared \