From 2295e96f69a8c13751ba69ea9176b0599c0909a8 Mon Sep 17 00:00:00 2001 From: CoprDistGit Date: Sat, 11 Jan 2025 14:20:43 +0000 Subject: automatic import of iSulad --- ...ix-run-ubuntu-container-bug-in-inspect.sh.patch | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 0039-fix-run-ubuntu-container-bug-in-inspect.sh.patch (limited to '0039-fix-run-ubuntu-container-bug-in-inspect.sh.patch') diff --git a/0039-fix-run-ubuntu-container-bug-in-inspect.sh.patch b/0039-fix-run-ubuntu-container-bug-in-inspect.sh.patch new file mode 100644 index 0000000..5501261 --- /dev/null +++ b/0039-fix-run-ubuntu-container-bug-in-inspect.sh.patch @@ -0,0 +1,27 @@ +From 8e1fe0302bf1a871f66a296e456811e878b1fa3b Mon Sep 17 00:00:00 2001 +From: jikai +Date: Tue, 2 Apr 2024 10:06:18 +0800 +Subject: [PATCH 39/69] fix run ubuntu container bug in inspect.sh + +Signed-off-by: jikai +--- + CI/test_cases/container_cases/inspect.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CI/test_cases/container_cases/inspect.sh b/CI/test_cases/container_cases/inspect.sh +index b4f4a785..86aed3d8 100755 +--- a/CI/test_cases/container_cases/inspect.sh ++++ b/CI/test_cases/container_cases/inspect.sh +@@ -146,7 +146,8 @@ function test_inspect_spec() + + isula rm -f $containername + +- isula run -it -m 4m --name $containername $ubuntu_image perl -e 'for ($i = 0; $i < 100000000; $i++) { $a .= " " x 1024 }' ++ # use more than 10m memory limit, otherwise it might fail to run ++ isula run -it -m 10m --name $containername $ubuntu_image perl -e 'for ($i = 0; $i < 100000000; $i++) { $a .= " " x 1024 }' + + isula inspect -f "{{json .State.OOMKilled}} {{.Name}}" $containername 2>&1 | sed -n '1p' | grep "true" + [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to check container with image: ${ubuntu_image}" && ((ret++)) +-- +2.34.1 + -- cgit v1.2.3