diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e7e6f20bc..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 @@ -486,8 +488,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 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:-""}"