From d8706f62d97aa04817c35292a723f61325298c7a Mon Sep 17 00:00:00 2001
From: Avi Deitcher <avi@deitcher.net>
Date: Mon, 24 Feb 2025 12:13:43 +0200
Subject: [PATCH] update test/pkg/containerd to work with containerd v2.x tests

Signed-off-by: Avi Deitcher <avi@deitcher.net>
---
 test/pkg/containerd/Dockerfile | 2 ++
 test/pkg/containerd/build.yml  | 1 -
 test/pkg/containerd/dmsetup.sh | 2 ++
 test/pkg/containerd/run.sh     | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100755 test/pkg/containerd/dmsetup.sh

diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile
index 3bd62b425..641e5f277 100644
--- a/test/pkg/containerd/Dockerfile
+++ b/test/pkg/containerd/Dockerfile
@@ -33,6 +33,8 @@ FROM scratch
 COPY --from=mirror /out/ /
 COPY --from=containerd-dev /go/src/github.com/containerd/containerd /go/src/github.com/containerd/containerd/
 
+RUN mv /sbin/dmsetup /sbin/dmsetup.orig
+COPY dmsetup.sh /sbin/dmsetup
 ENV GOPATH=/go
 WORKDIR $GOPATH/src/github.com/containerd/containerd
 ADD run.sh ./run.sh
diff --git a/test/pkg/containerd/build.yml b/test/pkg/containerd/build.yml
index cfa9679b4..bf3949f44 100644
--- a/test/pkg/containerd/build.yml
+++ b/test/pkg/containerd/build.yml
@@ -10,7 +10,6 @@ config:
     - /etc/resolv.conf:/etc/resolv.conf
     - /usr/bin/runc:/usr/bin/runc
     - /usr/bin/containerd:/usr/bin/containerd
-    - /usr/bin/containerd-shim:/usr/bin/containerd-shim
   devices:
     # all block and character devices
     - path: all
diff --git a/test/pkg/containerd/dmsetup.sh b/test/pkg/containerd/dmsetup.sh
new file mode 100755
index 000000000..8f8348530
--- /dev/null
+++ b/test/pkg/containerd/dmsetup.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+/sbin/dmsetup "$@" 2> >(sed 's/device or //g' >&2)
diff --git a/test/pkg/containerd/run.sh b/test/pkg/containerd/run.sh
index adedb52a7..281b8bb3c 100755
--- a/test/pkg/containerd/run.sh
+++ b/test/pkg/containerd/run.sh
@@ -16,6 +16,6 @@ export TMPDIR=/var/lib/tmp
 # unset -race (does not work on alpine; see golang/go#14481)
 export TESTFLAGS=
 # disable devmapper tests
-export SKIPTESTS="github.com/containerd/containerd/snapshots/devmapper github.com/containerd/containerd/snapshots/devmapper/dmsetup github.com/containerd/containerd/snapshots/devmapper/losetup"
+export SKIPTESTS="github.com/containerd/containerd/v2/plugins/snapshots/devmapper github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup"
 make root-test || failed
 printf "containerd test suite PASSED\n"