From 4bcf472de6ccf12b9f17ea095d8257fd7d7c1d18 Mon Sep 17 00:00:00 2001
From: Akhil Mohan <akhilerm@gmail.com>
Date: Wed, 16 Apr 2025 22:02:06 +0530
Subject: [PATCH 1/3] add option to skip tests in critest

Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
(cherry picked from commit 4ba3d82ca270937a428d4b6c006bd7e9f8261743)
(cherry picked from commit 8e6c93b6b057230915b449349836bf198f8ebcfe)
Signed-off-by: Derek McGowan <derek@mcg.dev>
---
 script/critest.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/script/critest.sh b/script/critest.sh
index 267d2082f..f212149e2 100755
--- a/script/critest.sh
+++ b/script/critest.sh
@@ -70,6 +70,11 @@ if [ ! -z "$CGROUP_DRIVER" ] && [ "$CGROUP_DRIVER" = "systemd" ];then
 EOF
 fi
 
+GINKGO_SKIP_TEST=()
+if [ ! -z "$SKIP_TEST" ]; then
+  GINKGO_SKIP_TEST+=("--ginkgo.skip" "$SKIP_TEST")
+fi
+
 ls /etc/cni/net.d
 
 /usr/local/bin/containerd \
@@ -85,4 +90,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 "${EXTRA_CRITEST_OPTIONS:-""}"
+critest --report-dir "$report_dir" --runtime-endpoint=unix:///${BDIR}/c.sock --parallel=8 "${GINKGO_SKIP_TEST[@]}" "${EXTRA_CRITEST_OPTIONS:-""}"

From b4a53e8264dd6cc93573630c0e59902eaa822886 Mon Sep 17 00:00:00 2001
From: Akhil Mohan <akhilerm@gmail.com>
Date: Wed, 16 Apr 2025 22:07:23 +0530
Subject: [PATCH 2/3] disable portmap test in ubuntu-22 to make CI happy

Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
(cherry picked from commit 338e0a1266302fed4b52a852735b90a832ad2b0f)
(cherry picked from commit 70db1bd00fb5db7c3958da4aefac0c41c89bb654)
Signed-off-by: Derek McGowan <derek@mcg.dev>
---
 .github/workflows/ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e7e6f20bc..3510fe162 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -486,8 +486,12 @@ jobs:
           TEST_RUNTIME: ${{ matrix.runtime }}
           CGROUP_DRIVER: ${{ matrix.cgroup_driver }}
         run: |
+          # skipping the ipv6 test till https://github.com/actions/runner-images/issues/11985 is fixed
+          if [[ ${{matrix.os}} == "ubuntu-22.04" ]]; then
+            skip_test="runtime should support port mapping with host port and container port"
+          fi
           env
-          sudo -E PATH=$PATH ./script/critest.sh "${{github.workspace}}/report"
+          sudo -E PATH=$PATH SKIP_TEST="$skip_test" ./script/critest.sh "${{github.workspace}}/report"
 
       # Log the status of this VM to investigate issues like
       # https://github.com/containerd/containerd/issues/4969

From 58b715ad8dd372472f91dec84aec581d35b417c0 Mon Sep 17 00:00:00 2001
From: Phil Estes <estesp@gmail.com>
Date: Wed, 16 Apr 2025 16:14:00 -0400
Subject: [PATCH 3/3] Disable arm64 criu testing in GH Actions

Due to current 100% failure rate on arm64 with the current OS image, disable criu testing for now

Signed-off-by: Phil Estes <estesp@amazon.com>
(cherry picked from commit 9ca6a7ee0aa0ea8added551dd16e00b2102fdea4)
Signed-off-by: Derek McGowan <derek@mcg.dev>
---
 .github/workflows/ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3510fe162..19b7ac879 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -405,7 +405,9 @@ jobs:
           script/setup/install-critools
           script/setup/install-failpoint-binaries
 
-      - name: Install criu
+      # Disable criu testing on arm64 until we can solve the consistent failures of restore testing
+      - if: matrix.os != 'ubuntu-24.04-arm'
+        name: Install criu
         run: |
           sudo add-apt-repository -y ppa:criu/ppa
           sudo apt-get update