From 7794827192553bacd96d7a10f2abd1572a20a8c7 Mon Sep 17 00:00:00 2001 From: wangkun1005 Date: Sat, 11 Oct 2025 16:14:48 +0800 Subject: [PATCH 1/2] update danbao testcase --- .../clamav/oe_test_clamav_clamdscan_scan.sh | 3 ++- .../clamav/oe_test_clamav_clamdscan_service.sh | 3 ++- .../cli-test/criu/oe_test_criu_base_dump_04.sh | 13 +++++++++---- .../pywbem/oe_test_pywbem_1.1.3_mof_compiler.sh | 6 ++++++ 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/testcases/cli-test/clamav/oe_test_clamav_clamdscan_scan.sh b/testcases/cli-test/clamav/oe_test_clamav_clamdscan_scan.sh index 0543f996d..7e7a99d21 100644 --- a/testcases/cli-test/clamav/oe_test_clamav_clamdscan_scan.sh +++ b/testcases/cli-test/clamav/oe_test_clamav_clamdscan_scan.sh @@ -21,7 +21,8 @@ source "${OET_PATH}/libs/locallibs/common_lib.sh" function pre_test() { LOG_INFO "Start to prepare the database config." - DNF_INSTALL "clamav clamav-server" + DNF_INSTALL "clamav clamav-server clamav-update" + freshclam mv /etc/clamd.d/scan.conf /etc/clamd.d/scan.conf.bak echo "LogFile /var/log/clamd.scan LogFileMaxSize 2M diff --git a/testcases/cli-test/clamav/oe_test_clamav_clamdscan_service.sh b/testcases/cli-test/clamav/oe_test_clamav_clamdscan_service.sh index 5324e4ba8..05e9cc10d 100644 --- a/testcases/cli-test/clamav/oe_test_clamav_clamdscan_service.sh +++ b/testcases/cli-test/clamav/oe_test_clamav_clamdscan_service.sh @@ -21,7 +21,8 @@ source "${OET_PATH}/libs/locallibs/common_lib.sh" function pre_test() { LOG_INFO "Start to prepare the database config." - DNF_INSTALL "clamav clamav-server" + DNF_INSTALL "clamav clamav-server clamav-update" + freshclam mv /etc/clamd.d/scan.conf /etc/clamd.d/scan.conf.bak echo "LogFile /var/log/clamd.scan LogFileMaxSize 2M diff --git a/testcases/cli-test/criu/oe_test_criu_base_dump_04.sh b/testcases/cli-test/criu/oe_test_criu_base_dump_04.sh index 8544425b8..afb2d0033 100644 --- a/testcases/cli-test/criu/oe_test_criu_base_dump_04.sh +++ b/testcases/cli-test/criu/oe_test_criu_base_dump_04.sh @@ -53,10 +53,15 @@ function run_test(){ CHECK_RESULT $? 0 0 "Check criu dump --file-validation failed" (test_process) & criu dump -D checkpoint_file -j -t $! --with-cpu-affinity CHECK_RESULT $? 0 0 "Check criu dump --with-cpu-affinity failed" - (test_process) & criu dump -D checkpoint_file -j -t $! --track-mem || (test_process) & criu dump -D checkpoint_file -j -t $! --track-mem 2>&1 | grep "Tracking memory is not available. Consider omitting --track-mem option" - CHECK_RESULT $? 0 0 "Check criu dump --track-mem failed" - pre_name='checkpoint_file' && pre_path=$(readlink -f $pre_name) - (test_process) & pid=$! && criu pre-dump -D checkpoint_file -j -t $pid + if [ "${NODE1_FRAME}" == x86_64 ]; then + (test_process) & criu dump -D checkpoint_file -j -t $! --track-mem + CHECK_RESULT $? 0 0 "Check criu dump --track-mem failed" + else + (test_process) & criu dump -D checkpoint_file -j -t $! --track-mem || (test_process) & criu dump -D checkpoint_file -j -t $! --track-mem 2>&1 | grep "Tracking memory is not available. Consider omitting --track-mem option" + CHECK_RESULT $? 0 0 "Check criu dump --track-mem failed" + fi + pre_name='checkpoint_file' && pre_path=$(readlink -f "$pre_name") + (test_process) & pid=$! && criu pre-dump -D checkpoint_file -j -t "$pid" criu dump -D checkpoint_file_2 -j -t $pid --prev-images-dir "$pre_path" CHECK_RESULT $? 0 0 "Check criu dump --prev-images-dir failed" LOG_INFO "End to run test." diff --git a/testcases/cli-test/pywbem/oe_test_pywbem_1.1.3_mof_compiler.sh b/testcases/cli-test/pywbem/oe_test_pywbem_1.1.3_mof_compiler.sh index b8a93a016..b8b005f70 100644 --- a/testcases/cli-test/pywbem/oe_test_pywbem_1.1.3_mof_compiler.sh +++ b/testcases/cli-test/pywbem/oe_test_pywbem_1.1.3_mof_compiler.sh @@ -23,6 +23,12 @@ function pre_test() { LOG_INFO "Start to prepare the test environment." cp -f ./common/CIM_Application26.mof ./ DNF_INSTALL "docker python3-pywbem" + PYWBEM_VERSION=$(yum info python3-pywbem 2>/dev/null | grep -E '^Version' | awk '{print $NF}' | head -1) + REQUIRED_VERSION=1.1.3 + if [[ "$PYWBEM_VERSION" != "$REQUIRED_VERSION" ]]; then + echo "当前仓库 python3-pywbem 版本为 ${PYWBEM_VERSION}，不等于${REQUIRED_VERSION}，跳过测试" + exit 255 + fi sudo docker pull hub.firefly.store/kschopmeyer/openpegasus-server:0.1.1 sudo docker run -d -it --rm -p 0.0.0.0:15988:5988 -p 0.0.0.0:15989:5989 --name openpegasus hub.firefly.store/kschopmeyer/openpegasus-server:0.1.1 SLEEP_WAIT 10s -- Gitee From d44e1f2f57addd2165f65ef9e7261c1d385964e7 Mon Sep 17 00:00:00 2001 From: wangkun1005 Date: Fri, 17 Oct 2025 17:14:40 +0800 Subject: [PATCH 2/2] update oe_test_kubeedge_deployment_guide.sh --- .../kubeedge/oe_test_kubeedge_deployment_guide.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testcases/feature-test/kubeedge/oe_test_kubeedge_deployment_guide.sh b/testcases/feature-test/kubeedge/oe_test_kubeedge_deployment_guide.sh index 28ca0dbf1..e17881a19 100644 --- a/testcases/feature-test/kubeedge/oe_test_kubeedge_deployment_guide.sh +++ b/testcases/feature-test/kubeedge/oe_test_kubeedge_deployment_guide.sh @@ -21,8 +21,9 @@ source "${OET_PATH}"/libs/locallibs/common_lib.sh function pre_test() { LOG_INFO "Start to prepare the test environment." - if [ "${NODE1_FRAME}" == "riscv64" ];then - LOG_WARN "Testing cannot be performed if NODE1_FRAME is riscv64" + VERSION_ID=$(grep "VERSION_ID" /etc/os-release | awk -F '\"' '{print$2}') + if [ "${NODE1_FRAME}" == "riscv64" ] || [ "$VERSION_ID" == "24.03" ];then + LOG_WARN "Testing cannot be performed if the architecture is riscv64 or the version is 24.03." exit 255 fi hostName_bak=$(hostname) -- Gitee