diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e289d7812..41bce00c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -479,10 +479,17 @@ jobs: run: | CONTAINERD_RUNTIME=$TEST_RUNTIME make cri-integration + - name: Fix up for actuated + # https://github.com/containerd/containerd/pull/9920#issuecomment-2024823587 + if: ${{ (matrix.os == 'actuated-arm64-4cpu-16gb') && (matrix.runc == 'crun') }} + run: | + echo "EXTRA_CRITEST_OPTIONS=--ginkgo.skip=runtime should support NamespaceMode_POD" >> $GITHUB_ENV + - name: cri-tools critest env: TEST_RUNTIME: ${{ matrix.runtime }} run: | + env sudo -E PATH=$PATH ./script/critest.sh "${{github.workspace}}/report" # Log the status of this VM to investigate issues like diff --git a/script/critest.sh b/script/critest.sh index 0b270cd3b..1493c1827 100755 --- a/script/critest.sh +++ b/script/critest.sh @@ -35,6 +35,13 @@ cat > ${BDIR}/config.toml < "snapshotter \"overlayfs\" doesn't support idmap mounts on this host, +# > configure \`slow_chown\` to allow a slower and expensive fallback" +# https://github.com/containerd/containerd/pull/9920#issuecomment-1978901454 +# This is safely ignored for kernel >= 5.19. +slow_chown = true EOF ls /etc/cni/net.d @@ -51,4 +58,4 @@ do crictl --runtime-endpoint ${BDIR}/c.sock info && break || sleep 1 done -critest --report-dir "$report_dir" --runtime-endpoint=unix:///${BDIR}/c.sock --parallel=8 +critest --report-dir "$report_dir" --runtime-endpoint=unix:///${BDIR}/c.sock --parallel=8 "${EXTRA_CRITEST_OPTIONS:-""}" diff --git a/script/setup/critools-version b/script/setup/critools-version index 9b277b94a..c8c2eaea5 100644 --- a/script/setup/critools-version +++ b/script/setup/critools-version @@ -1 +1 @@ -v1.29.0 +v1.30.0