Merge pull request #22831 from Luap99/system-tmpfs

CI: mount tmpfs for container storage

contrib/cirrus/lib.sh

@@ -150,6 +150,9 @@ setup_rootless() {
     showrun groupadd -g $rootless_gid $ROOTLESS_USER
     showrun useradd -g $rootless_gid -u $rootless_uid --no-user-group --create-home $ROOTLESS_USER
 
+    # use tmpfs to speed up IO
+    mount -t tmpfs -o size=75%,mode=0700,uid=$rootless_uid,gid=$rootless_gid none /home/$ROOTLESS_USER
+
     echo "$ROOTLESS_USER ALL=(root) NOPASSWD: ALL" > /etc/sudoers.d/ci-rootless
 
     mkdir -p "$HOME/.ssh" "/home/$ROOTLESS_USER/.ssh"

contrib/cirrus/setup_environment.sh

@@ -167,10 +167,10 @@ runroot = "/run/containers/storage"
 graphroot = "/var/lib/containers/storage"
 EOF
 
-# Since we've potentially changed important config settings, reset.
-# This prevents `database graph driver "" does not match "overlay"`
-# on Debian.
-rm -rf /var/lib/containers/storage
+
+# mount a tmpfs for the container storage to speed up the IO
+# side effect is we clear all potentially pre existing data so we know we always start "clean"
+mount -t tmpfs -o size=75%,mode=0700 none /var/lib/containers
 
 # shellcheck disable=SC2154
 showrun echo "Setting CI_DESIRED_STORAGE [=$CI_DESIRED_STORAGE] for *e2e* tests"

test/system/160-volumes.bats

@@ -534,8 +534,15 @@ EOF
     CONTAINERS_CONF_OVERRIDE="$containersconf" run_podman run --rm volume_image stat -f -c %T /data
     is "$output" "tmpfs" "Should be tmpfs"
 
-    CONTAINERS_CONF_OVERRIDE="$containersconf" run_podman run --image-volume anonymous --rm volume_image stat -f -c %T /data
-    assert "$output" != "tmpfs" "Should match hosts $fs"
+    # get the hostfs first so we can match it below
+    run_podman info --format {{.Store.GraphRoot}}
+    hostfs=$(stat -f -c %T $output)
+
+    # stat -f -c %T seems to just return unknown for our normal bind mount for some reason.
+    # Therfore manually parse /proc/mounts to get the real fs for the bind mount.
+    CONTAINERS_CONF_OVERRIDE="$containersconf" run_podman run --image-volume anonymous --rm volume_image \
+        sh -c "grep ' /data ' /proc/mounts | cut -f3 -d' '"
+    assert "$output" == "$hostfs" "Should match hosts graphroot fs"
 
     CONTAINERS_CONF_OVERRIDE="$containersconf" run_podman run --image-volume tmpfs --rm volume_image stat -f -c %T /data
     is "$output" "tmpfs" "Should be tmpfs"