diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a2ec8e2..3d01497 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,7 +140,7 @@ jobs: mkdir -p ~/.local/bin # use pre-installed golang instead of brew ln -s `which go` /usr/local/Homebrew/Library/Homebrew/shims/mac/super/go - brew install ukontainer/lkl/containerd ukontainer/lkl/nerdctl --ignore-dependencies + brew install ukontainer/lkl/darwin-snapshotter ukontainer/lkl/containerd ukontainer/lkl/nerdctl --ignore-dependencies brew install coreutils ln -sf /usr/local/bin/gsha256sum ~/.local/bin/sha256sum @@ -328,6 +328,7 @@ jobs: run: | cat /tmp/dockerd.log || true cat /tmp/containerd.log || true + cat /tmp/darwin-snapshotter.log || true - run: kind export logs logs if: runner.os == 'linux' && matrix.arch == 'amd64' && always() diff --git a/test/containerd-ctr-test.sh b/test/containerd-ctr-test.sh index bb0bf5c..ea39f51 100644 --- a/test/containerd-ctr-test.sh +++ b/test/containerd-ctr-test.sh @@ -7,7 +7,7 @@ if [ $TRAVIS_OS_NAME != "osx" ] ; then exit 0 fi -CTR_ARGS="--rm --runtime=io.containerd.runu.v1 --fifo-dir /tmp/ctrd --env RUMP_VERBOSE=1" +CTR_ARGS="--rm --snapshotter=sparsebundle --runtime=io.containerd.runu.v1 --fifo-dir /tmp/ctrd --env RUMP_VERBOSE=1" CTR_GLOBAL_OPT="--debug -a /tmp/ctrd/run/containerd/containerd.sock" sudo rm -rf /tmp/ctrd/ @@ -29,6 +29,9 @@ fold_start test.containerd.0 "boot containerd" sleep 3 chmod 755 /tmp/ctrd + containerd-darwin-snapshotter-grpc /tmp/ctrd/run/containerd-darwin-snapshotter.sock /tmp/ctrd/var/lib/containerd/darwin > /tmp/darwin-snapshotter.log 2>&1 & + + ctr $CTR_GLOBAL_OPT version nerdctl $CTR_GLOBAL_OPT version nerdctl $CTR_GLOBAL_OPT info diff --git a/test/containerd-nerdctl-test.sh b/test/containerd-nerdctl-test.sh index 7a90b56..36cee24 100644 --- a/test/containerd-nerdctl-test.sh +++ b/test/containerd-nerdctl-test.sh @@ -7,8 +7,8 @@ if [ $TRAVIS_OS_NAME != "osx" ] ; then exit 0 fi -CTR_GLOBAL_OPT="--debug -a /tmp/ctrd/run/containerd/containerd.sock --snapshotter=darwin" -NERDCTL_ARGS="--rm --env RUMP_VERBOSE=1" +CTR_GLOBAL_OPT="--debug -a /tmp/ctrd/run/containerd/containerd.sock --snapshotter=sparsebundle" +NERDCTL_ARGS="--rm --env RUMP_VERBOSE=1 --net=none" ### @@ -58,5 +58,6 @@ create_runu_aux_dir fold_start test.nerdctl.5 "test alpine Linux on darwin (nerdctl)" sudo nerdctl $CTR_GLOBAL_OPT run $NERDCTL_ARGS \ --env RUNU_AUX_DIR=$RUNU_AUX_DIR --env LKL_USE_9PFS=1 \ + --platform=linux/amd64 \ library/alpine:latest /bin/busybox ls -l fold_end test.nerdctl.5