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