diff --git a/test/vm.install b/test/vm.install index 2223b67c6..43687ed7e 100755 --- a/test/vm.install +++ b/test/vm.install @@ -35,12 +35,22 @@ if [ "$ID" = "fedora" ]; then fi fi -# copy images for user podman tests; podman insists on user session -loginctl enable-linger $(id -u admin) -for img in quay.io/libpod/busybox quay.io/libpod/alpine quay.io/cockpit/registry:2; do - podman save $img | sudo -i -u admin podman load -done -loginctl disable-linger $(id -u admin) +# HACK HACK +if [ "$ID" = "ubuntu" ]; then + # copy images for user podman tests; podman insists on user session + loginctl enable-linger $(id -u admin) + for img in quay.io/libpod/busybox quay.io/libpod/alpine quay.io/cockpit/registry:2 k8s.gcr.io/pause:3.5; do + podman save $img | sudo -i -u admin podman load + done + loginctl disable-linger $(id -u admin) +else + # copy images for user podman tests; podman insists on user session + loginctl enable-linger $(id -u admin) + for img in quay.io/libpod/busybox quay.io/libpod/alpine quay.io/cockpit/registry:2; do + podman save $img | sudo -i -u admin podman load + done + loginctl disable-linger $(id -u admin) +fi # 15minutes after boot tmp files are removed and podman stores some tmp lock files systemctl disable --now systemd-tmpfiles-clean.timer