diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-21 17:19:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-21 17:19:05 -0400 |
| commit | 077e7c5068e12c46356bf5591b1ef58da349af36 (patch) | |
| tree | 5be2d510c4bf3959629000a8944be7b361d3888a | |
| parent | bdbd477c286b8bcf27a498d0f8b0e8ba7642a018 (diff) | |
| parent | d24507c1ec5ec5108a31293ff59d21cf0c69d565 (diff) | |
| download | podman-077e7c5068e12c46356bf5591b1ef58da349af36.tar.gz podman-077e7c5068e12c46356bf5591b1ef58da349af36.tar.bz2 podman-077e7c5068e12c46356bf5591b1ef58da349af36.zip | |
Merge pull request #13960 from cevich/fix_upgrade
Fix upgrade tests assuming storage.conf exists
| -rw-r--r-- | test/upgrade/test-upgrade.bats | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/upgrade/test-upgrade.bats b/test/upgrade/test-upgrade.bats index 198d8a169..5efe05d49 100644 --- a/test/upgrade/test-upgrade.bats +++ b/test/upgrade/test-upgrade.bats @@ -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 \ |