mirror of
https://github.com/containerd/containerd.git
synced 2026-11-06 05:17:02 +00:00
ci: skip the user namespace and checkpoint tests for the Rust shim
The Rust shim now sets up a PTY's stdin without blocking, so TestContainerPTY runs again. The CRI suite had no way to leave tests out; it takes a SKIP pattern now, like FOCUS, and the Rust legs use it for the user namespace tests, which need idmapped mounts the shim does not do yet. The checkpoint disable script is skipped for the Rust shim as well: it has no Checkpoint RPC, so the script's second case, a checkpoint that must succeed with enable_criu unset, cannot pass with it. Its integration legs already run with -no-criu. Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
2 files changed
+10
-4
No files matched your search
@@ -419,9 +419,11 @@ jobs:
|
||||
- runtime: io.containerd.runc.v2-rs
|
||||
os: ubuntu-24.04-arm
|
||||
include:
|
||||
# Not supported by the Rust shim yet.
|
||||
# Not supported by the Rust shim yet: checkpoints, trace propagation,
|
||||
# State during an exec(TestIssue10589), and the idmapped mounts user namespaces need.
|
||||
- runtime: io.containerd.runc.v2-rs
|
||||
extra_testflags: "-no-criu -test.skip='(TestContainerPTY|TestIssue10589|TestShimTraceContextPropagation)'"
|
||||
extra_testflags: "-no-criu -test.skip='(TestIssue10589|TestShimTraceContextPropagation)'"
|
||||
cri_skip: "(TestPodUserNS|TestUsernsVolumeCopyUp|TestImageVolumeWithUserNamespace|TestIssue10598)"
|
||||
|
||||
env:
|
||||
GOTEST: gotestsum --
|
||||
@@ -565,6 +567,7 @@ jobs:
|
||||
TEST_RUNTIME: ${{ matrix.runtime }}
|
||||
CGROUP_DRIVER: ${{ matrix.cgroup_driver }}
|
||||
RUNC_FLAVOR: ${{ matrix.runc }}
|
||||
SKIP: ${{ matrix.cri_skip }}
|
||||
run: |
|
||||
cat /sys/fs/cgroup/cgroup.controllers
|
||||
systemctl status
|
||||
@@ -582,7 +585,8 @@ jobs:
|
||||
env
|
||||
sudo -E PATH=$PATH ./script/critest.sh "${{github.workspace}}/report"
|
||||
|
||||
- if: matrix.os != 'ubuntu-24.04-arm'
|
||||
# The Rust shim does not implement checkpoint yet.
|
||||
- if: matrix.os != 'ubuntu-24.04-arm' && matrix.runtime != 'io.containerd.runc.v2-rs'
|
||||
name: Checkpoint/Restore Disable via CRI
|
||||
env:
|
||||
TEST_RUNTIME: ${{ matrix.runtime }}
|
||||
|
||||
@@ -29,6 +29,8 @@ ROOT="$(pwd)"
|
||||
|
||||
# FOCUS focuses the test to run.
|
||||
FOCUS=${FOCUS:-""}
|
||||
# SKIP leaves out the tests matching the pattern.
|
||||
SKIP=${SKIP:-""}
|
||||
# REPORT_DIR is the directory to store test logs.
|
||||
if [ $IS_WINDOWS -eq 0 ]; then
|
||||
REPORT_DIR=${REPORT_DIR:-"/tmp/test-integration"}
|
||||
@@ -55,7 +57,7 @@ if [ -n "${RUNC_FLAVOR:-}" ]; then
|
||||
fi
|
||||
CMD+="${PWD}/bin/cri-integration.test${EXE_SUFFIX}"
|
||||
|
||||
${CMD} --test.run="${FOCUS}" --test.v \
|
||||
${CMD} --test.run="${FOCUS}" --test.skip="${SKIP}" --test.v \
|
||||
--cri-endpoint="${CONTAINERD_SOCK}" \
|
||||
--runtime-handler="${RUNTIME}" \
|
||||
--runtime-type="${RUNTIME_TYPE}" \
|
||||
|
||||
Reference in new issue
Block a user