From 926ad1172ee53bf07a3b91d66598a2a2b0729052 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Mon, 31 Mar 2025 14:48:43 +0200 Subject: [PATCH 1/3] test/compose: remove cni reference CNI is not being tested here for a long time, use a more appropriate directory name. Signed-off-by: Paul Holzinger --- test/compose/test-compose | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/compose/test-compose b/test/compose/test-compose index ec87c291e3..a771cd2928 100755 --- a/test/compose/test-compose +++ b/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,cni} + rm -rf $WORKDIR/{root,runroot,networks} else - $PODMAN_BIN unshare rm -rf $WORKDIR/{root,runroot,cni} + $PODMAN_BIN unshare rm -rf $WORKDIR/{root,runroot,networks} fi rm -f $DOCKER_SOCK - mkdir --mode 0755 $WORKDIR/{root,runroot,cni} + mkdir --mode 0755 $WORKDIR/{root,runroot,networks} chcon --reference=/var/lib/containers $WORKDIR/root $PODMAN_BIN \ @@ -212,7 +212,7 @@ function start_service() { --root $WORKDIR/root \ --runroot $WORKDIR/runroot \ --cgroup-manager=systemd \ - --network-config-dir $WORKDIR/cni \ + --network-config-dir $WORKDIR/networks \ system service \ --time 0 unix://$DOCKER_SOCK \ &> $WORKDIR/server.log & @@ -239,7 +239,7 @@ function podman() { --storage-driver=vfs \ --root $WORKDIR/root \ --runroot $WORKDIR/runroot \ - --network-config-dir $WORKDIR/cni \ + --network-config-dir $WORKDIR/networks \ "$@") rc=$? From 9f422e1a77c07a8e0103705bcff1b691ac0e22c2 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Mon, 31 Mar 2025 14:54:00 +0200 Subject: [PATCH 2/3] 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 --- test/compose/cdi_device/setup.sh | 10 +--------- test/compose/cdi_device/teardown.sh | 3 --- test/compose/test-compose | 8 +++++--- 3 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 test/compose/cdi_device/teardown.sh diff --git a/test/compose/cdi_device/setup.sh b/test/compose/cdi_device/setup.sh index 224caa5443..af081c2544 100644 --- a/test/compose/cdi_device/setup.sh +++ b/test/compose/cdi_device/setup.sh @@ -1,9 +1 @@ -if is_rootless; then - 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 +cp device.json $WORKDIR/cdi diff --git a/test/compose/cdi_device/teardown.sh b/test/compose/cdi_device/teardown.sh deleted file mode 100644 index 770afd1269..0000000000 --- a/test/compose/cdi_device/teardown.sh +++ /dev/null @@ -1,3 +0,0 @@ -if ! is_rootless; then - umount -l /etc/cdi -fi diff --git a/test/compose/test-compose b/test/compose/test-compose index a771cd2928..5e90148284 100755 --- a/test/compose/test-compose +++ b/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=$? From f07a95da0ec713d92ad5edab37159feda2b8b8a7 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Mon, 31 Mar 2025 15:00:12 +0200 Subject: [PATCH 3/3] test/compose: use 4 spaces indentation For consistency. Signed-off-by: Paul Holzinger --- test/compose/test-compose | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/compose/test-compose b/test/compose/test-compose index 5e90148284..07e28d4de6 100755 --- a/test/compose/test-compose +++ b/test/compose/test-compose @@ -237,7 +237,7 @@ function start_service() { function podman() { echo "\$ podman $*" >>$WORKDIR/output.log output=$($PODMAN_BIN \ - --storage-driver=vfs \ + --storage-driver=vfs \ --root $WORKDIR/root \ --runroot $WORKDIR/runroot \ --network-config-dir $WORKDIR/networks \ @@ -403,7 +403,7 @@ for t in "${tests_to_run[@]}"; do fi # FIXME: run 'podman ps'? -# rm -rf $WORKDIR/${testname} + # rm -rf $WORKDIR/${testname} done # END entry handler