!132 [sync] PR-129: 解决disk测试提示pci-num参数为定位问题

From: @openeuler-sync-bot 
Reviewed-by: @meitingli 
Signed-off-by: @meitingli
This commit is contained in:
openeuler-ci-bot 2022-10-26 12:45:47 +00:00 committed by Gitee
commit a8355f2bf9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,24 @@
diff -Naur rpm/tests/disk/common.py oech/tests/disk/common.py
--- rpm/tests/disk/common.py 2022-10-26 19:50:53.857748470 +0800
+++ oech/tests/disk/common.py 2022-10-26 19:38:37.545748470 +0800
@@ -39,7 +39,7 @@
command.run_cmd("cat /proc/mdstat")
-def get_disk(logger, command, config_data, pci_num):
+def get_disk(logger, command, config_data, pci_num=""):
"""
Get disk info
"""
diff -Naur rpm/tests/disk/disk.py oech/tests/disk/disk.py
--- rpm/tests/disk/disk.py 2022-10-26 19:50:53.857748470 +0800
+++ oech/tests/disk/disk.py 2022-10-26 19:38:37.545748470 +0800
@@ -42,7 +42,7 @@
"""
Start test
"""
- self.disks = get_disk(self.logger, self.command, self.config_data, self.pci_num)
+ self.disks = get_disk(self.logger, self.command, self.config_data)
if len(self.disks) == 0:
self.logger.error("No suite disk found to test.")
return False

View File

@ -4,13 +4,14 @@
Name: oec-hardware Name: oec-hardware
Summary: openEuler Hardware Compatibility Test Suite Summary: openEuler Hardware Compatibility Test Suite
Version: 1.1.3 Version: 1.1.3
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.3-fix-disk.patch
Buildroot: %{_tmppath}/%{name}-%{version}-root Buildroot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: gcc BuildRequires: gcc
@ -34,6 +35,7 @@ openEuler Hardware Compatibility Test Server
%prep %prep
%setup -q -c %setup -q -c
%patch1 -p1
%build %build
@ -76,6 +78,9 @@ DESTDIR=$RPM_BUILD_ROOT make install
rm -rf /var/lock/oech.lock rm -rf /var/lock/oech.lock
%changelog %changelog
* Wed Oct 26 2022 cuixucui <cuixucui1@h-partner.com> - 1.1.3-1
- Add default values to the parameters of get_disk function
* Mon Oct 24 2022 zhangyale <zhangyale3@h-partners.com> - 1.1.3-0 * Mon Oct 24 2022 zhangyale <zhangyale3@h-partners.com> - 1.1.3-0
- Add support for openEuler 22.03 LTS SP1 - Add support for openEuler 22.03 LTS SP1
- Add AMD GPU testcase - Add AMD GPU testcase