test/compose: use cdi option over mount

So that we don't have to overwrite a system dir and also can test
rootless.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>

test/compose/cdi_device/setup.sh

@@ -1,9 +1 @@
-if is_rootless; then
+cp device.json $WORKDIR/cdi
-    reason=" - can't write to /etc/cdi"
-    _show_ok skip "$testname # skip$reason"
-    exit 0
-fi
-
-mkdir -p /etc/cdi
-mount -t tmpfs tmpfs /etc/cdi
-cp device.json /etc/cdi

test/compose/cdi_device/teardown.sh

@@ -1,3 +0,0 @@
-if ! is_rootless; then
-    umount -l /etc/cdi
-fi

test/compose/test-compose

@@ -198,12 +198,12 @@ function start_service() {
 
     # FIXME: use ${testname} subdir but we can't: 50-char limit in runroot
     if ! is_rootless; then
-        rm -rf $WORKDIR/{root,runroot,networks}
+        rm -rf $WORKDIR/{root,runroot,networks,cdi}
     else
-        $PODMAN_BIN unshare rm -rf $WORKDIR/{root,runroot,networks}
+        $PODMAN_BIN unshare rm -rf $WORKDIR/{root,runroot,networks,cdi}
     fi
     rm -f $DOCKER_SOCK
-    mkdir --mode 0755 $WORKDIR/{root,runroot,networks}
+    mkdir --mode 0755 $WORKDIR/{root,runroot,networks,cdi}
     chcon --reference=/var/lib/containers $WORKDIR/root
 
     $PODMAN_BIN \
@@ -213,6 +213,7 @@ function start_service() {
         --runroot $WORKDIR/runroot \
         --cgroup-manager=systemd \
         --network-config-dir $WORKDIR/networks \
+        --cdi-spec-dir $WORKDIR/cdi \
         system service \
         --time 0 unix://$DOCKER_SOCK \
         &> $WORKDIR/server.log &
@@ -240,6 +241,7 @@ function podman() {
         --root    $WORKDIR/root    \
         --runroot $WORKDIR/runroot \
         --network-config-dir $WORKDIR/networks \
+        --cdi-spec-dir $WORKDIR/cdi \
         "$@")
     rc=$?