增加qemu_test功能，对os-basic样例脚本的更改

dep_install.sh

@@ -25,7 +25,7 @@ usage() {
 }
 
 common_dep(){
-    yum install expect psmisc make iputils python3-six python3-paramiko -y
+    yum install expect psmisc make iputils python3-six python3-paramiko lshw -y
 }
 
 anolis_dep(){

libs/locallibs/write_conf.py

@@ -78,7 +78,7 @@ def write_conf(ip, password, port=22, user="root", run_remote=False, copy_all=Tr
     else:
         ENV_DATA = {"NODE": []}
 
-    if subprocess.getstatusoutput("ip a | grep " + ip)[0] == 0:
+    if subprocess.getstatusoutput("ip a | grep " + ip+'/')[0] == 0:
         NODE_DATA["LOCALTION"] = "local"
     elif run_remote:
         NODE_DATA["LOCALTION"] = "local"
@@ -117,7 +117,7 @@ def write_conf(ip, password, port=22, user="root", run_remote=False, copy_all=Tr
     NODE_DATA["FRAME"] = stdout.read().decode("utf-8").strip("\n")
 
     stdin, stdout, stderr = ssh.exec_command(
-        " ip route | grep " + ip + " | awk '{print $3}' | sort -u"
+        " ip route | grep " + ip + " | awk '{print $3}' |grep -v "+ ip +"| sort -u"
     )
     NODE_DATA["NIC"] = stdout.read().decode("utf-8").strip("\n")
 

testcases/system-test/system-integration/os-basic/oe_test_awk/oe_test_awk.sh

@@ -30,7 +30,7 @@ function run_test() {
     LOG_INFO "Start to run test."
     cat /etc/passwd |awk  -F ':'  '{print $1}' |grep root
     CHECK_RESULT $? 0 0  "check root result fail"
-    cat /proc/cpuinfo |awk '{print$1}'|grep cpuid
+    cat /proc/cpuinfo |awk '{print$1}'|grep -E "cpuid|processor"
     CHECK_RESULT $? 0 0  "check cpuid result fail"
     awk --help | grep "Usage: awk"
     CHECK_RESULT $? 0 0 "check Tail's help manual fail"

testcases/system-test/system-integration/os-basic/oe_test_disk_graphics_card/oe_test_disk_graphics_card.sh

@@ -20,7 +20,7 @@
 source ${OET_PATH}/libs/locallibs/common_lib.sh
 function pre_test() {
     LOG_INFO "Start to pre the test env"
-    DNF_INSTALL dmidecode
+    DNF_INSTALL "dmidecode csh lshw"
     LOG_INFO "End to pre the test env"
 }
 function run_test() {
@@ -36,7 +36,7 @@ function run_test() {
     CHECK_RESULT $?
     su testuser -c "echo $SHELL" | grep "/bin/csh"
     CHECK_RESULT $? 0 1
-    sudo lshw -c network | grep "network"
+    sudo lshw -c network | grep -E "network|virtio"
     CHECK_RESULT $?
     LOG_INFO "End to run test."
 }

testcases/system-test/system-integration/os-basic/oe_test_disk_schedule_specific/oe_test_disk_schedule_specific.sh

@@ -20,13 +20,14 @@ function config_params() {
     LOG_INFO "Start to config params of the case."
     check_free_disk
     old_scheduler=$(awk -F '[' '{print$2}' /sys/block/"${local_disk}"/queue/scheduler | awk -F ']' '{print$1}')
-    echo bfq >/sys/block/"${local_disk}"/queue/scheduler
+    test_scheduler=$(awk '{print$2}' /sys/block/"${local_disk}"/queue/scheduler)
+    echo "$test_scheduler" >/sys/block/"${local_disk}"/queue/scheduler
     LOG_INFO "End to config params of the case."
 }
 
 function run_test() {
     LOG_INFO "Start to run test."  
-    awk -F '[' '{print$2}' /sys/block/"${local_disk}"/queue/scheduler | awk -F ']' '{print$1}' | grep bfq
+    awk -F '[' '{print$2}' /sys/block/"${local_disk}"/queue/scheduler | awk -F ']' '{print$1}' | grep "$test_scheduler"
     CHECK_RESULT $?
     LOG_INFO "End to run test."
 }

testcases/system-test/system-integration/os-basic/oe_test_kernel_cgroup/oe_test_kernel_cgroup.sh

@@ -28,7 +28,7 @@ done" >testcgroup.sh
     sh testcgroup.sh &
     pid=$(pgrep -f "sh testcgroup.sh")
     mkdir /sys/fs/cgroup/memory/example
-    LOG_INFO "Start to pre test."
+    LOG_INFO "End to pre test."
 }
 
 function run_test() {

testcases/system-test/system-integration/os-basic/oe_test_kernel_kdump/oe_test_kernel_kdump.sh

@@ -18,6 +18,12 @@
 # ############################################
 
 source ${OET_PATH}/libs/locallibs/common_lib.sh
+function pre_test() {
+    LOG_INFO "Start to pre test."
+    DNF_INSTALL kexec-tools
+    LOG_INFO "End to pre test."
+}
+
 function run_test() {
     LOG_INFO "Start executing testcase."
     rpm -q kexec-tools

testcases/system-test/system-integration/os-basic/oe_test_system_monitor_share_total/oe_test_system_monitor_share_total.sh

@@ -29,7 +29,11 @@ function run_test() {
     CHECK_RESULT $?
     ps -eo 'pmem,pid,comm,args' | sort -rk1 | sed -n 1p | awk -F " " {'print$1'} | grep "%MEM"
     CHECK_RESULT $?
-    grep  '\[mq-deadline\] kyber bfq none' /sys/block/vda/queue/scheduler
+    grep '\[mq-deadline\]' /sys/block/vda/queue/scheduler
+    CHECK_RESULT $?
+    grep 'none' /sys/block/vda/queue/scheduler
+    CHECK_RESULT $?
+    grep -E 'kyber|bfq' /sys/block/vda/queue/scheduler
     CHECK_RESULT $?
     LOG_INFO "End to run test."
 }

testcases/system-test/system-integration/os-basic/oe_test_who/oe_test_who.sh

@@ -26,7 +26,7 @@ function run_test() {
     who -b | grep "system boot"
     CHECK_RESULT $?
 
-    who -s | grep pts
+    who -s | grep -E "pts|ttyS"
     CHECK_RESULT $?
 
     who --help | grep "Usage"