!238 [sync] Upgrade oec-hardware version to 1.1.6

From: @WANG-shine 
Reviewed-by: @ygn-ndwd-official 
Signed-off-by: @ygn-ndwd-official

oec-hardware-1.1.5-3-functional-optimization-fix-bug.patch

@@ -1,82 +0,0 @@
-diff -Naur rpm/tests/compatible/kabi/kabi.py oech/tests/compatible/kabi/kabi.py
---- rpm/tests/compatible/kabi/kabi.py	2024-06-04 15:27:10.013346551 +0800
-+++ oech/tests/compatible/kabi/kabi.py	2024-06-04 15:30:53.001506902 +0800
-@@ -121,8 +121,8 @@
-         if product == "openEuler":
-             standard_kernel_version = getoutput(
-                 "dnf list --repo=source | grep '^kernel.src' | awk '{print $2}'")
--            self.command.run_cmd("dnf download --source kernel-%s"
--                                 % standard_kernel_version)
-+            self.command.run_cmd("dnf download --source kernel-%s --downloaddir %s"
-+                                 % (standard_kernel_version, rpmpath))
-         elif product == "KylinSec":
-             kylinsec_version = getoutput("cat /etc/dnf/vars/osversion | sed 's/[^0-9]//g'")
-             kernel_dict = Document(CertEnv.kernelinfo, self.logger)
-@@ -138,7 +138,7 @@
-             self.logger.info("Currently, this system is not supported to test kabi,"
-                              " Please add the corresponding system in kernelrelease.json.")
- 
--        rpm = os.path.join("kernel-" + standard_kernel_version + ".src.rpm")
-+        rpm = os.path.join(rpmpath, "kernel-" + standard_kernel_version + ".src.rpm")
-         getoutput("rpm -ivh %s" % rpm)
-         os.remove(rpm)
-         return standard_symvers
-diff -Naur rpm/tests/compatible/kabiwhitelist/kabi_check.sh oech/tests/compatible/kabiwhitelist/kabi_check.sh
---- rpm/tests/compatible/kabiwhitelist/kabi_check.sh	2024-06-04 15:27:10.013346551 +0800
-+++ oech/tests/compatible/kabiwhitelist/kabi_check.sh	2024-06-04 15:29:30.189447349 +0800
-@@ -19,6 +19,10 @@
- arch=`uname -m`
- url="https://gitee.com/src-openeuler/kernel/raw/$os_version/kabi_whitelist_$arch"
- wget $url
-+# if get kabi_whitelist failed because of internet or other
-+if [ ! -f $testdir"/kabi_whitelist_"$arch ]; then
-+       cp /root/kabi_whitelist_$arch $testdir/
-+fi
- kernel_version=`uname -r`
- symvers_gz="symvers-"$kernel_version".gz"
- cp /boot/$symvers_gz   /usr/share/oech/lib/tests/compatible/kabiwhitelist/test_log
-@@ -103,6 +107,9 @@
- 	if [ -f /root/$line ]; then
- 		cp /root/$line  ./
- 		echo $line >> dirth
-+        else
-+                echo "no ko or rpm file" >> nofile.txt
-+                exit 0
- 	fi
- done
- cat dirth|while read line;
-diff -Naur rpm/tests/compatible/kabiwhitelist/kabiwhitelist.py oech/tests/compatible/kabiwhitelist/kabiwhitelist.py
---- rpm/tests/compatible/kabiwhitelist/kabiwhitelist.py	2024-06-04 15:27:10.013346551 +0800
-+++ oech/tests/compatible/kabiwhitelist/kabiwhitelist.py	2024-06-04 15:30:38.354496369 +0800
-@@ -46,6 +46,10 @@
-         if ko_result[2] == 0:
-             self.logger.error("Please configure the board information in the configuration file")
-             return False
-+        ko_file_result = self.command.run_cmd("ls %s/test_log/ | grep nofile" % kabi_whitelist_dir)
-+        if ko_file_result[2] == 0:
-+            self.logger.error("Please put ko or rpm file configured in the configuration file into the /root")
-+            return False
-         self.logger.info("Ko or rpm check complete")
- 
-         test_result = self.command.run_cmd("ls %s/test_log | grep change" % kabi_whitelist_dir)
-diff -Naur rpm/tests/compatible/system/system.py oech/tests/compatible/system/system.py
---- rpm/tests/compatible/system/system.py	2024-06-04 15:27:10.019346555 +0800
-+++ oech/tests/compatible/system/system.py	2024-06-04 15:32:25.527573326 +0800
-@@ -94,6 +94,8 @@
-             os_version = getoutput("cat /etc/os-release | grep -i version_id | awk -F = '{print $2}' | sed 's/[\"]//g'")
-         elif product == "UOS":
-             os_version = getoutput("cat /etc/os-release | grep -i version_id | awk -F = '{print $2}' | sed 's/[\"]//g'")
-+        elif self.sysinfo.product is not None and self.sysinfo.get_version() is not None:
-+            os_version = self.sysinfo.product + " " + self.sysinfo.get_version()
-         else:
-             self.logger.error("Failed to get os version info.")
-         self.logger.info("OS Version: %s" % os_version, terminal_print=False)
-@@ -115,6 +117,8 @@
-             kernel_release = kernel_dict.document[product][os_version].split('/')[1].split('-')[0]
-         elif product == "UOS":
-             kernel_release = kernel_dict.document[product][os_version].split('/')[1].split('-')[0]
-+        elif kernel_dict.document[product] is not None and kernel_dict.document[product][os_version] is not None:
-+            kernel_release = kernel_dict.document[product][os_version]
-         try:
-             if kernel_release != self.sysinfo.kernel_version:
-                 self.logger.error("Failed to check kernel %s GA status." %

oec-hardware-1.1.5-4-fix-gpu-testcase-bug.patch

@@ -1,12 +0,0 @@
-diff -Naur rpm/tests/compatible/gpu/nvidia_gpu.py oech/tests/compatible/gpu/nvidia_gpu.py
---- rpm/tests/compatible/gpu/nvidia_gpu.py	2024-06-07 16:37:44.542417257 +0800
-+++ oech/tests/compatible/gpu/nvidia_gpu.py	2024-06-07 16:38:57.149472108 +0800
-@@ -174,7 +174,7 @@
-                 self.logger.error("Using nvidia-smi to test Drvier failed.")
- 
-             env_display = os.getenv('DISPLAY')
--            if env_display != '':
-+            if env_display is not None and env_display != '':
-                 self.logger.info("Start to test Vulkan.")
-                 self.set_default_gpu()
-                 code = self.command.run_cmd(

oec-hardware-1.1.5-5-fix-cpufreq-userspace.patch

@@ -1,19 +0,0 @@
-diff -Naur rpm/tests/compatible/cpufreq/cal.py oech/tests/compatible/cpufreq/cal.py
---- rpm/tests/compatible/cpufreq/cal.py	2024-08-14 11:28:15.885339696 +0800
-+++ oech/tests/compatible/cpufreq/cal.py	2024-08-14 11:29:13.689645189 +0800
-@@ -14,13 +14,14 @@
- 
- import decimal
- import time
-+COUNT = 10000
- 
- 
- def cal():
-     """Call test_case"""
-     decimal.getcontext().prec = 1000
-     one = decimal.Decimal(1)
--    for i in range(1000):
-+    for i in range(COUNT):
-         (i * one).sqrt()
- 
- 

oec-hardware-1.1.5-6-fix-bug-gpu.patch

@@ -1,36 +0,0 @@
-diff -Naur rpm/tests/compatible/gpu/nvidia_gpu.py oech/tests/compatible/gpu/nvidia_gpu.py
---- rpm/tests/compatible/gpu/nvidia_gpu.py	2024-08-29 19:48:19.472522063 +0800
-+++ oech/tests/compatible/gpu/nvidia_gpu.py	2024-08-30 16:21:51.821261220 +0800
-@@ -73,6 +73,11 @@
- 
-         self.logger.info("Set default test gpu as %s." % id_num)
- 
-+    def clean_default_gpu(self):
-+        if 'CUDA_VISIBLE_DEVICES' in os.environ:
-+            del os.environ['CUDA_VISIBLE_DEVICES']
-+            self.logger.info("Clean default test gpu.")
-+
-     def test_pressure(self):
-         """
-         Set pressure for gpu to test
-@@ -87,10 +92,7 @@
- 
-         os.chdir("/opt/gpu-burn")
-         cmd = self.command.run_cmd(
--            "nvidia-smi -q | grep -i -A1 '%s' | grep 'Product Name' | cut -d ':' -f 2" % pci_num)
--        device_name = cmd[0].strip()
--        cmd = self.command.run_cmd(
--            "./gpu_burn -l | grep -i '%s' | cut -d ':' -f 1 | awk '{print $2}'" % device_name)
-+            "nvidia-smi -q | grep -i -A20 '%s' | grep 'Minor Number' | cut -d ':' -f 2" % pci_num)
-         run_id = cmd[0].strip()
-         cmd = getstatusoutput(
-             'nohup ./gpu_burn -i%s 10 &> %s &' % (run_id, self.gpu_burn))
-@@ -185,6 +187,8 @@
-                     result = False
-                     self.logger.error("Test Vulkan failed.")
- 
-+            self.clean_default_gpu()
-+
-         except Exception as e:
-             self.logger.error(
-                 "Failed to run the script because compiling or setting variables: %s" % e)

oec-hardware.spec

@@ -5,20 +5,14 @@
 
 Name:           oec-hardware
 Summary:        openEuler Hardware Compatibility Test Suite
-Version:        1.1.5
-Release:        6
+Version:        1.1.6
+Release:        0
 Group:          Development/Tools
 License:        Mulan PSL v2
 URL:            https://gitee.com/openeuler/oec-hardware
 Source0:        https://gitee.com/openeuler/oec-hardware/repository/archive/v%{version}.tar.gz
 
 # patch fix issue
-Patch0001:      oec-hardware-1.1.5-1-add-virtual-branch-fix-bug.patch
-Patch0002:      oec-hardware-1.1.5-2-fix-bug.patch
-Patch0003:      oec-hardware-1.1.5-3-functional-optimization-fix-bug.patch
-Patch0004:      oec-hardware-1.1.5-4-fix-gpu-testcase-bug.patch
-Patch0005:      oec-hardware-1.1.5-5-fix-cpufreq-userspace.patch
-Patch0006:      oec-hardware-1.1.5-6-fix-bug-gpu.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  gcc
@@ -42,12 +36,6 @@ openEuler Hardware Compatibility Test Server
 
 %prep
 %setup -q -c
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 %ifarch x86_64 aarch64
@@ -95,12 +83,11 @@ sed -i 's#grep openeulerversion /etc/openEuler-latest#grep %{vendor_lowercase}ve
 rm -rf /var/lock/oech.lock
 
 %changelog
-* Fri Aug 30 2024 gaochuanji <gaochuanji@inspur.com> - 1.1.5-6
-- Resolve the issue of the gpu_burn test failed when multiple gpus
-- Resolve the issue of first gpu test success and others failed when multiple gpus
-
-* Tue Aug 13 2024 gaochuanji <gaochuanji@inspur.com> - 1.1.5-5
-- Resolve the issue of failed userspace testing for cpufreq on certain models
+* Tue Sep 24 2024 wangshuai <wangshuai321@huawei.com> - 1.1.6-0
+- Add new test suite srpm and intel
+- Add virtual branch of test suite
+- Add support for Kylin and UOS
+- Bugfix
 
 * Fri Jun 7 2024 xiaochn <xiaochuannan@inspur.com> - 1.1.5-4
 - Resolve the issue of executing Vulkan even if DISPLAY is not defined in the env