diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-11 15:38:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-11 15:38:41 +0100 |
| commit | 8fd31c674b02b800267b2a759e2406902fdb2723 (patch) | |
| tree | 4a537e16b67bd8267833e87a6c230463803b6a67 | |
| parent | 5f3ce2515d9bbae726e14ef4bc7dede442a6c582 (diff) | |
| parent | c43b81f9a0fbb08a3048dc687796ea38971382de (diff) | |
| download | podman-8fd31c674b02b800267b2a759e2406902fdb2723.tar.gz podman-8fd31c674b02b800267b2a759e2406902fdb2723.tar.bz2 podman-8fd31c674b02b800267b2a759e2406902fdb2723.zip | |
Merge pull request #12260 from Luap99/upgrade-flake
Fix flake in upgrade tests
| -rw-r--r-- | test/upgrade/test-upgrade.bats | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/test/upgrade/test-upgrade.bats b/test/upgrade/test-upgrade.bats index f6f32242b..c0d601586 100644 --- a/test/upgrade/test-upgrade.bats +++ b/test/upgrade/test-upgrade.bats @@ -123,8 +123,15 @@ EOF # Clean up vestiges of previous run $PODMAN rm -f podman_parent || true - # Not entirely a NOP! This is just so we get /run/crun created on a CI VM - $PODMAN run --rm $OLD_PODMAN true + + local netname=testnet-$(random_string 10) + $PODMAN network create $netname + + # Not entirely a NOP! This is just so we get the /run/... mount points created on a CI VM + # --mac-address is needed to create /run/cni, --network is needed to create /run/containers for dnsname + $PODMAN run --rm --mac-address 78:28:a6:8d:24:8a --network $netname $OLD_PODMAN true + $PODMAN network rm -f $netname + # # Use new-podman to run the above script under old-podman. @@ -136,7 +143,8 @@ EOF # # mount /etc/containers/storage.conf to use the same storage settings as on the host # mount /dev/shm because the container locks are stored there - # mount /var/lib/cni and /etc/cni/net.d for cni networking + # mount /var/lib/cni, /run/cni and /etc/cni/net.d for cni networking + # mount /run/containers for the dnsname plugin # $PODMAN run -d --name podman_parent --pid=host \ --privileged \ @@ -147,6 +155,8 @@ EOF -v /dev/fuse:/dev/fuse \ -v /run/crun:/run/crun \ -v /run/netns:/run/netns:rshared \ + -v /run/containers:/run/containers \ + -v /run/cni:/run/cni \ -v /var/lib/cni:/var/lib/cni \ -v /etc/cni/net.d:/etc/cni/net.d \ -v /dev/shm:/dev/shm \ |