48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
|
From 411483ad9b2a0c50190f9b56779d41889c895014 Mon Sep 17 00:00:00 2001
|
||
|
|
From: zhongtao <zhongtao17@huawei.com>
|
||
|
|
Date: Wed, 27 Mar 2024 10:29:11 +0800
|
||
|
|
Subject: [PATCH 34/34] bugfix for cpurt.sh
|
||
|
|
|
||
|
|
Signed-off-by: zhongtao <zhongtao17@huawei.com>
|
||
|
|
---
|
||
|
|
CI/test_cases/container_cases/cpu_rt.sh | 9 ++++-----
|
||
|
|
1 file changed, 4 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/CI/test_cases/container_cases/cpu_rt.sh b/CI/test_cases/container_cases/cpu_rt.sh
|
||
|
|
index 23d3baed..64dcd81f 100755
|
||
|
|
--- a/CI/test_cases/container_cases/cpu_rt.sh
|
||
|
|
+++ b/CI/test_cases/container_cases/cpu_rt.sh
|
||
|
|
@@ -109,7 +109,7 @@ function test_kernel_without_cpurt()
|
||
|
|
isulad --cpu-rt-period 1000000 --cpu-rt-runtime 950000 2>&1 | grep 'Your kernel does not support cgroup rt period'
|
||
|
|
[[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - kernel does not support cpu-rt, but start isulad with cpu-rt success" && ((ret++))
|
||
|
|
|
||
|
|
- start_isulad_without_valgrind
|
||
|
|
+ start_isulad_with_valgrind
|
||
|
|
|
||
|
|
isula pull ${image}
|
||
|
|
[[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to pull image: ${image}" && return ${FAILURE}
|
||
|
|
@@ -194,6 +194,9 @@ function do_test()
|
||
|
|
test_cpurt_isulad_abnormal $runtime || ((ret++))
|
||
|
|
test_isula_update_normal $runtime || ((ret++))
|
||
|
|
test_isula_update_abnormal $runtime || ((ret++))
|
||
|
|
+ stop_isulad_without_valgrind
|
||
|
|
+ # set cpu-rt to the initial state
|
||
|
|
+ start_isulad_with_valgrind --cpu-rt-period 1000000 --cpu-rt-runtime 0
|
||
|
|
else
|
||
|
|
test_kernel_without_cpurt $runtime || ((ans++))
|
||
|
|
fi
|
||
|
|
@@ -211,10 +214,6 @@ do
|
||
|
|
|
||
|
|
do_test $element || ((ans++))
|
||
|
|
|
||
|
|
- stop_isulad_without_valgrind
|
||
|
|
- # set cpu-rt to the initial state
|
||
|
|
- start_isulad_with_valgrind --cpu-rt-period 1000000 --cpu-rt-runtime 0
|
||
|
|
-
|
||
|
|
isula rm -f $(isula ps -aq)
|
||
|
|
done
|
||
|
|
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|