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:
parent
cb09c26c65
commit
d24507c1ec
|
|
@ -146,6 +146,12 @@ EOF
|
|||
# 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
|
||||
|
||||
# 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.
|
||||
|
|
@ -165,7 +171,7 @@ EOF
|
|||
--net=host \
|
||||
--cgroupns=host \
|
||||
--pid=host \
|
||||
-v /etc/containers/storage.conf:/etc/containers/storage.conf \
|
||||
$v_sconf \
|
||||
-v /dev/fuse:/dev/fuse \
|
||||
-v /run/crun:/run/crun \
|
||||
-v /run/netns:/run/netns:rshared \
|
||||
|
|
|
|||
Loading…
Reference in New Issue