!267 [sync] PR-261: 【Routine Upgrade】Sync differences from source repositories-2024/11/13

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

docs/Release_announcement/oec-hardware-1.1.6-release-announcement.md

@@ -0,0 +1,29 @@
+# 1.1.6-4 Patch Update Contents
+
+## Bug Fixes
+* [Kdump test suite fix](https://gitee.com/openeuler/oec-hardware/pulls/296)
+
+# 1.1.6-3 Patch Update Contents
+
+## Bug Fixes
+* [Remove unused variable in cdrom test suite](https://gitee.com/openeuler/oec-hardware/pulls/281)
+* [Optimize the display judgement of gpu and unify the location for downloading kernel source RPMs etc.](https://gitee.com/openeuler/oec-hardware/pulls/291)
+
+## Optimization
+* [Update test_guide doc](https://gitee.com/openeuler/oec-hardware/pulls/282)
+* [Update pci.ids](https://gitee.com/openeuler/oec-hardware/pulls/284)
+* [Update the design doc of oech and add comments of main module](https://gitee.com/openeuler/oec-hardware/pulls/289)
+
+# 1.1.6-2 Patch Update Contents
+
+## Bug Fixes
+* [Optimize "show_hugepages" function in dpdk test suite](https://gitee.com/openeuler/oec-hardware/pulls/287)
+
+# 1.1.6-1 Patch Update Contents
+
+## Addtions
+* [Add the raid test identification of PM8222-SHBA](https://gitee.com/openeuler/oec-hardware/pulls/288)
+# 1.1.6 Release announcement
+
+
+

oec-hardware-1.1.6-1-fix-bug-raid-test-cannot-identify-PM8222-SHBA.patch

@@ -0,0 +1,12 @@
+diff -Naur rpm/hwcompatible/compatibility.py oech/hwcompatible/compatibility.py
+--- rpm/hwcompatible/compatibility.py	2024-09-25 15:21:01.000000000 +0800
++++ oech/hwcompatible/compatibility.py	2024-10-15 08:48:21.768690626 +0800
+@@ -341,6 +341,8 @@
+                     sort_devices["disk"] = [empty_device]
+             if "RAID" in device.get_property("ID_PCI_SUBCLASS_FROM_DATABASE") or \
+                     ("SCSI" in device.get_property("ID_PCI_SUBCLASS_FROM_DATABASE") and
++                     "SHBA" in device.get_property("ID_MODEL_FROM_DATABASE")) or \
++                    ("SCSI" in device.get_property("ID_PCI_SUBCLASS_FROM_DATABASE") and
+                      "HBA" not in device.get_property("ID_MODEL_FROM_DATABASE")):
+                 if "raid" in sort_devices.keys():
+                     sort_devices["raid"].extend([device])

oec-hardware-1.1.6-2-fix-dpdk-show-numa-pages.patch

@@ -0,0 +1,14 @@
+diff -Naur rpm/tests/compatible/dpdk/hugepages.py oech/tests/compatible/dpdk/hugepages.py
+--- rpm/tests/compatible/dpdk/hugepages.py	2024-09-25 15:21:01.000000000 +0800
++++ oech/tests/compatible/dpdk/hugepages.py	2024-10-18 10:06:36.033839943 +0800
+@@ -62,6 +62,10 @@
+         for numa_path in glob.glob('/sys/devices/system/node/node*'):
+             node = numa_path[29:]  # slice after /sys/devices/system/node/node
+             path = os.path.join(numa_path, 'hugepages')
++            if not os.path.exists(path):
++                self.logger.info("%s doesn't exist" % path)
++                continue
++
+             for hdir in os.listdir(path):
+                 comm = self.command.run_cmd("cat %s/%s/nr_hugepages" % (path, hdir))
+                 pages = int(comm[0].strip('\n'))

oec-hardware.spec

@@ -1,17 +1,22 @@
 %global _build_id_links none
 %undefine __brp_mangle_shebangs
+%define vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler}
+%define vendor_lowercase %{?_vendor:%(echo %{_vendor} | tr '[:upper:]' '[:lower:]')}%{!?_vendor:openeuler}
 
 Name:           oec-hardware
 Summary:        openEuler Hardware Compatibility Test Suite
-Version:        1.1.5
-Release:        1
+Version:        1.1.6
+Release:        4 
 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
+Patch0001:      oec-hardware-1.1.6-1-fix-bug-raid-test-cannot-identify-PM8222-SHBA.patch
+Patch0002:	oec-hardware-1.1.6-2-fix-dpdk-show-numa-pages.patch
+Patch0003:	oec-hardware-1.1.6-3-optimize-gpu-display.patch
+Patch0004:      oec-hardware-1.1.6-4-kdump-fix.patch 
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  gcc
@@ -36,6 +41,9 @@ openEuler Hardware Compatibility Test Server
 %prep
 %setup -q -c
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %ifarch x86_64 aarch64
@@ -49,6 +57,9 @@ DESTDIR=$RPM_BUILD_ROOT VERSION_RELEASE=%{version} make
 %install
 DESTDIR=$RPM_BUILD_ROOT make install
 
+# Custom vendor
+sed -i 's#grep openeulerversion /etc/openEuler-latest#grep %{vendor_lowercase}version /etc/%{vendor}-latest#g' %{buildroot}/usr/share/oech/lib/hwcompatible/cert_info.py
+
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
 
@@ -80,6 +91,46 @@ DESTDIR=$RPM_BUILD_ROOT make install
 rm -rf /var/lock/oech.lock
 
 %changelog
+* Wed Nov 13 2024 wangshuai <wangshuai321@huawei.com> - 1.1.6-4
+- Kdump test suite bugfix
+
+* Tue Oct 29 2024 wangshuai <wangshuai321@huawei.com> - 1.1.6-3
+- Update the pci.ids file
+- Remove unused variable in cdrom test suite
+- Update test_guide doc
+- Unify the location for downloading kernel source RPMs
+- Optimize kabiwhitelist and system test
+
+* Fri Oct 18 2024 xieguangyao00 <xieguangyao@inspur.com> - 1.1.6-2
+- Fix the bug that dpdk test terminates when accessing numa node hugepages directory
+
+* Tue Oct 15 2024 xiaochn <xiaochuannan@inspur.com> - 1.1.6-1
+- Fix bug that the raid test cannot identify PM8222-SHBA
+
+* 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
+
+* Tue Jun 4 2024 xiaochn <xiaochuannan@inspur.com> - 1.1.5-3
+- Resolve the issue of different kernel source download locations in kabi test case
+- Resolve the issue that kabiwhitelist still passes when the ko and rpm file does not exist
+- Add the way for manually adding kabiwhitelist file
+- For custom vendors, refer to the method of obtaining openEuler os information
+- Supports custom vendor
+
+* Wed Nov 29 2023 cuixucui <cuixucui@h-partner.com> - 1.1.5-1
+- Resolve kdump\watchdog\cpufreq\kabiwhitelist\network test failure issue 
+- Add fio test cases:read,write,randread,randwrite
+- Solve the nvme line break issue in the command line interface
+- Fix compilation errors in the make command
+- Add Vulkan testcase for nvida GPU
+- Resolve the issue of oech server startup failure on version 24.03
+
 * Wed Nov 29 2023 cuixucui <cuixucui@h-partner.com> - 1.1.5-1
 - Add virtual cases
 - Resolve IB startup IB_Read_BW service failure issue