From 6c3c5376fc168a7cd7950b40c5a904133993c173 Mon Sep 17 00:00:00 2001
From: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Date: Mon, 4 Mar 2024 17:21:13 +0900
Subject: [PATCH 1/2] critools-version: v1.30.0

Pulls in kubernetes-sigs/cri-tools PR 1344 (`KEP-3857: Recursive Read-only (RRO) mounts`)
to test PR 9787

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
---
 script/critest.sh             | 7 +++++++
 script/setup/critools-version | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/script/critest.sh b/script/critest.sh
index 0b270cd3b..e205e6355 100755
--- a/script/critest.sh
+++ b/script/critest.sh
@@ -35,6 +35,13 @@ cat > ${BDIR}/config.toml <<EOF
 version = 2
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
 runtime_type = "${TEST_RUNTIME}"
+[plugins."io.containerd.snapshotter.v1.overlayfs"]
+# slow_chown is needed to avoid an error with kernel < 5.19:
+# > "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
 
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

From 3b065cdddb19f339ccdb28af0977ce9a5d11e668 Mon Sep 17 00:00:00 2001
From: Wei Fu <fuweid89@gmail.com>
Date: Thu, 2 May 2024 22:18:32 +0800
Subject: [PATCH 2/2] CI: skip test in arm64 CI

Co-authored-by: Wei Fu <fuweid89@gmail.com>
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
---
 .github/workflows/ci.yml | 7 +++++++
 script/critest.sh        | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

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 e205e6355..1493c1827 100755
--- a/script/critest.sh
+++ b/script/critest.sh
@@ -58,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:-""}"