!104 [sync] PR-101: 解决system用例中工具检测失败问题
From: @openeuler-sync-bot Reviewed-by: @meitingli Signed-off-by: @meitingli
This commit is contained in:
commit
d036b2abe7
12
oec-hardware-1.1.2-fix-system.patch
Normal file
12
oec-hardware-1.1.2-fix-system.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -Naur rpm/tests/system/system.py oech/tests/system/system.py
|
||||||
|
--- rpm/tests/system/system.py 2022-09-05 16:28:46.418278940 +0800
|
||||||
|
+++ oech/tests/system/system.py 2022-09-05 16:31:23.830278940 +0800
|
||||||
|
@@ -62,7 +62,7 @@
|
||||||
|
|
||||||
|
output = rpm_verify[0].split('\n')
|
||||||
|
for file in output:
|
||||||
|
- if "test_config.yaml" in file:
|
||||||
|
+ if not file or "test_config.yaml" in file:
|
||||||
|
continue
|
||||||
|
flag = False
|
||||||
|
self.logger.error(
|
||||||
@ -4,7 +4,7 @@
|
|||||||
Name: oec-hardware
|
Name: oec-hardware
|
||||||
Summary: openEuler Hardware Compatibility Test Suite
|
Summary: openEuler Hardware Compatibility Test Suite
|
||||||
Version: 1.1.2
|
Version: 1.1.2
|
||||||
Release: 1
|
Release: 2
|
||||||
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
|
||||||
@ -12,6 +12,7 @@ Source0: https://gitee.com/openeuler/oec-hardware/repository/archive/v%{v
|
|||||||
|
|
||||||
# patch fix issue
|
# patch fix issue
|
||||||
Patch0001: oec-hardware-1.1.2-fix-oech.service_status_failed.patch
|
Patch0001: oec-hardware-1.1.2-fix-oech.service_status_failed.patch
|
||||||
|
Patch0002: oec-hardware-1.1.2-fix-system.patch
|
||||||
|
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
@ -35,6 +36,7 @@ openEuler Hardware Compatibility Test Server
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -c
|
%setup -q -c
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
@ -77,6 +79,9 @@ DESTDIR=$RPM_BUILD_ROOT make install
|
|||||||
rm -rf /var/lock/oech.lock
|
rm -rf /var/lock/oech.lock
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 05 2022 cuixucui <cuixucui1@h-partners.com> - 1.1.2-2
|
||||||
|
- Fix Check whether the tool is modified failed
|
||||||
|
|
||||||
* Sat Sep 03 2022 ylzhangah <zhangyale3@h-partners.com> - 1.1.2-1
|
* Sat Sep 03 2022 ylzhangah <zhangyale3@h-partners.com> - 1.1.2-1
|
||||||
- Fix the status failed in checking oech.service status after stoped oech.service
|
- Fix the status failed in checking oech.service status after stoped oech.service
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user