更新22.03-LST-SP4分支到oec-hardware最新的版本

oec-hardware.spec

@@ -3,28 +3,30 @@
 
 Name:           oec-hardware
 Summary:        openEuler Hardware Compatibility Test Suite
-Version:        1.1.4
-Release:        0
+Version:        1.1.5
+Release:        2
 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
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  gcc
 Requires:       kernel-devel, kernel-headers, dmidecode, tar
 Requires:       kernel >= 4
-Requires:       python3, python3-pyyaml, python3-concurrent-log-handler
+Requires:       python3, python3-pyyaml, python3-concurrent-log-handler, net-tools
 Provides:       libswsds.so()(64bit)
 
 # server subpackage
 %package server
 Summary:        openEuler Hardware Compatibility Test Server
 Group:          Development/Tools
-Requires:       python3, python3-devel, python3-flask, python3-uWSGI
-Requires:       nginx, tar, qperf, psmisc
+Requires:       python3, python3-devel, python3-flask, python3-uWSGI, python3-werkzeug
+Requires:       nginx, tar, qperf, psmisc, dpdk, dpdk-tools, dpdk-devel, net-tools, perftest
 
 %description
 openEuler Hardware Compatibility Test Suite
@@ -34,10 +36,14 @@ openEuler Hardware Compatibility Test Server
 
 %prep
 %setup -q -c
+%patch1 -p1
+%patch2 -p1
 
 %build
-strip tests/keycard/libswsds_%{_arch}.so
-sed -i '15i CFLAGS+=-g -fstack-protector-strong' tests/memory/Makefile
+%ifarch x86_64 aarch64
+strip tests/compatible/keycard/libswsds_%{_arch}.so
+%endif
+sed -i '15i CFLAGS+=-g -fstack-protector-strong' tests/compatible/memory/Makefile
 
 [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
 DESTDIR=$RPM_BUILD_ROOT VERSION_RELEASE=%{version} make
@@ -76,6 +82,27 @@ DESTDIR=$RPM_BUILD_ROOT make install
 rm -rf /var/lock/oech.lock
 
 %changelog
+* 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
+- Delete redundant references
+- Resolve incorrect type in vgpu result data
+- Resolve the issue of getting the kernel source rpm 
+
+* Tue Oct 24 2023 cuixucui <cuixucui@h-partner.com> - 1.1.5-0
+- Add support for openEuler 20.03 LTS SP4, openEuler 22.03 LTS SP2, openEuler 22.03 LTS SP3
+- Add modifications to Kylinsec with oec-hardware
+- Add support for Loongson and SW architectures
+- Bugfix
+
 * Tue Feb 28 2023 cuixucui <cuixucui1@h-partner.com> - 1.1.4-0
 - Add board information in the test report
 - Add spdk test case