From 5b809ca4406d4bbe4b71c72b5462cec6c067ec91 Mon Sep 17 00:00:00 2001 From: Fupan Li Date: Thu, 9 Jan 2025 22:06:55 +0800 Subject: [PATCH] CI: a workaround for containerd v2.x e2e test the latest containerd had an issue for its e2e test, thus we should do the following fix to workaround this issue. For much info about this issue, please see: https://github.com/containerd/containerd/pull/11240 Once this pr was merged and release new version, we can remove this workaround. Signed-off-by: Fupan Li --- tests/integration/cri-containerd/integration-tests.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/integration/cri-containerd/integration-tests.sh b/tests/integration/cri-containerd/integration-tests.sh index a55706d5ad..6dd3b0eec2 100755 --- a/tests/integration/cri-containerd/integration-tests.sh +++ b/tests/integration/cri-containerd/integration-tests.sh @@ -612,6 +612,12 @@ function main() { # Make sure the right artifacts are going to be built sudo make clean + # the latest containerd had an issue for its e2e test, thus we should do the following + # fix to workaround this issue. For much info about this issue, please see: + # https://github.com/containerd/containerd/pull/11240 + # Once this pr was merged and release new version, we can remove this workaround. + sed -i 's/cat "\${config_file}"/cat "\${CONTAINERD_CONFIG_FILE}"/' script/test/utils.sh + check_daemon_setup info "containerd(cri): testing using runtime: ${containerd_runtime_type}"