github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 17:26:28 +00:00
Code Issues Projects Releases Wiki Activity

update test/pkg/containerd to work with containerd v2.x tests

Browse Source 
Signed-off-by: Avi Deitcher <avi@deitcher.net>
This commit is contained in:
Avi Deitcher 2025-02-24 12:13:43 +02:00
parent ffe27fd0aa
commit d8706f62d9
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/pkg/containerd/Dockerfile
View File

@ -33,6 +33,8 @@ FROM scratch
COPY --from=mirror /out/ / COPY --from=mirror /out/ /
COPY --from=containerd-dev /go/src/github.com/containerd/containerd /go/src/github.com/containerd/containerd/ 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 ENV GOPATH=/go
WORKDIR $GOPATH/src/github.com/containerd/containerd WORKDIR $GOPATH/src/github.com/containerd/containerd
ADD run.sh ./run.sh ADD run.sh ./run.sh

1
test/pkg/containerd/build.yml
View File

@ -10,7 +10,6 @@ config:
- /etc/resolv.conf:/etc/resolv.conf - /etc/resolv.conf:/etc/resolv.conf
- /usr/bin/runc:/usr/bin/runc - /usr/bin/runc:/usr/bin/runc
- /usr/bin/containerd:/usr/bin/containerd - /usr/bin/containerd:/usr/bin/containerd
- /usr/bin/containerd-shim:/usr/bin/containerd-shim
devices: devices:
# all block and character devices # all block and character devices
- path: all - path: all

2
test/pkg/containerd/dmsetup.sh Executable file
View File

@ -0,0 +1,2 @@
#!/bin/sh
/sbin/dmsetup "$@" 2> >(sed 's/device or //g' >&2)

2
test/pkg/containerd/run.sh
View File

@ -16,6 +16,6 @@ export TMPDIR=/var/lib/tmp
# unset -race (does not work on alpine; see golang/go#14481) # unset -race (does not work on alpine; see golang/go#14481)
export TESTFLAGS= export TESTFLAGS=
# disable devmapper tests # 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 make root-test || failed
printf "containerd test suite PASSED\n" printf "containerd test suite PASSED\n"