packages/oec-hardware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!244 [sync] PR-239: Fix bug that the raid test cannot identify PM8222-SHBA

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @ygn-ndwd-official 
Signed-off-by: @ygn-ndwd-official
This commit is contained in:
openeuler-ci-bot 2024-10-16 07:33:10 +00:00 committed by Gitee
commit c1d155d1d1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
oec-hardware-1.1.6-1-fix-bug-raid-test-cannot-identify-PM8222-SHBA.patch Normal file
View File

@ -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])

7
oec-hardware.spec
View File

@ -6,13 +6,14 @@
Name: oec-hardware Name: oec-hardware
Summary: openEuler Hardware Compatibility Test Suite Summary: openEuler Hardware Compatibility Test Suite
Version: 1.1.6 Version: 1.1.6
Release: 0 Release: 1
Group: Development/Tools Group: Development/Tools
License: Mulan PSL v2 License: Mulan PSL v2
URL: https://gitee.com/openeuler/oec-hardware URL: https://gitee.com/openeuler/oec-hardware
Source0: https://gitee.com/openeuler/oec-hardware/repository/archive/v%{version}.tar.gz Source0: https://gitee.com/openeuler/oec-hardware/repository/archive/v%{version}.tar.gz
# patch fix issue # patch fix issue
Patch0001: oec-hardware-1.1.6-1-fix-bug-raid-test-cannot-identify-PM8222-SHBA.patch
Buildroot: %{_tmppath}/%{name}-%{version}-root Buildroot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: gcc BuildRequires: gcc
@ -36,6 +37,7 @@ openEuler Hardware Compatibility Test Server
%prep %prep
%setup -q -c %setup -q -c
%patch1 -p1
%build %build
%ifarch x86_64 aarch64 %ifarch x86_64 aarch64
@ -83,6 +85,9 @@ sed -i 's#grep openeulerversion /etc/openEuler-latest#grep %{vendor_lowercase}ve
rm -rf /var/lock/oech.lock rm -rf /var/lock/oech.lock
%changelog %changelog
* 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 * Tue Sep 24 2024 wangshuai <wangshuai321@huawei.com> - 1.1.6-0
- Add new test suite srpm and intel - Add new test suite srpm and intel
- Add virtual branch of test suite - Add virtual branch of test suite