iSulad/0068-fix-ci-error.patch
zhangxiaoyu 68738aa0f1 upgrade from upstream
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
2023-06-01 12:04:54 +08:00

46 lines
1.7 KiB
Diff

From 1894ea2f37e13a49acddc9dff0362a8286f8e73d Mon Sep 17 00:00:00 2001
From: zhongtao <zhongtao17@huawei.com>
Date: Sat, 13 May 2023 14:13:17 +0800
Subject: [PATCH 68/79] fix ci error
Signed-off-by: zhongtao <zhongtao17@huawei.com>
---
CI/test_cases/container_cases/update.sh | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/CI/test_cases/container_cases/update.sh b/CI/test_cases/container_cases/update.sh
index 39049b54..9147b9e0 100755
--- a/CI/test_cases/container_cases/update.sh
+++ b/CI/test_cases/container_cases/update.sh
@@ -119,16 +119,17 @@ function do_test_t()
done
fi
if [[ ${main} -lt 5 ]] || [[ ${main} -eq 5 ]] && [[ ${minor} -lt 11 ]] && [[ ${enable} -eq 1 ]]; then
- isula update --kernel-memory 2000000000 $containername
- fn_check_eq "$?" "0" "update failed"
-
- isula start $containername
- fn_check_eq "$?" "0" "start failed"
- tmp=`isula exec $containername cat /sys/fs/cgroup/memory/memory.kmem.limit_in_bytes`
- value=$(($tmp - 2000000000))
- if [[ $value -lt -10000 || $value -gt 10000 ]]; then
- echo "Failed to check running reservation memory"
- TC_RET_T=$(($TC_RET_T+1))
+ isula update --kernel-memory 2000000000 $containername
+ fn_check_eq "$?" "0" "update failed"
+
+ isula start $containername
+ fn_check_eq "$?" "0" "start failed"
+ tmp=`isula exec $containername cat /sys/fs/cgroup/memory/memory.kmem.limit_in_bytes`
+ value=$(($tmp - 2000000000))
+ if [[ $value -lt -10000 || $value -gt 10000 ]]; then
+ echo "Failed to check running reservation memory"
+ TC_RET_T=$(($TC_RET_T+1))
+ fi
fi
isula rm -f $containername
--
2.25.1