From 15e35d71429cc87be81cbf48d3fb4a57c0598b49 Mon Sep 17 00:00:00 2001 From: xiaochn Date: Thu, 15 May 2025 09:26:26 +0800 Subject: [PATCH] update to 1.1.7-1 (cherry picked from commit bebd35fd0914e73a0943df8e8719f2ec1c631c8a) --- ...oec-hardware-1.1.7-release-announcement.md | 17 ++- ...1.1.7-1-fix-bugs-and-add-kylinsec353.patch | 126 ++++++++++++++++++ oec-hardware.spec | 13 +- 3 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 oec-hardware-1.1.7-1-fix-bugs-and-add-kylinsec353.patch diff --git a/docs/Release_announcement/oec-hardware-1.1.7-release-announcement.md b/docs/Release_announcement/oec-hardware-1.1.7-release-announcement.md index c05b8d6..d814163 100644 --- a/docs/Release_announcement/oec-hardware-1.1.7-release-announcement.md +++ b/docs/Release_announcement/oec-hardware-1.1.7-release-announcement.md @@ -1,3 +1,18 @@ +# 1.1.7-1 Patch Update Contents + +## New +* [add KylinSec 3.5.3 support](https://gitee.com/openeuler/oec-hardware/pulls/313) + +## Bug Fixes +* [Fix the problem of disk size calculation](https://gitee.com/openeuler/oec-hardware/pulls/312) +* [Fix bcm57414 nic test failed issue](https://gitee.com/openeuler/oec-hardware/pulls/311) +* [Fixed a bug where a non-existent logger level was used](https://gitee.com/openeuler/oec-hardware/pulls/307) +* [Fix vgpu testing issue](https://gitee.com/openeuler/oec-hardware/pulls/305) + +## Optimization +* [Change the format of date](https://gitee.com/openeuler/oec-hardware/pulls/308) +* [Update README.md](https://gitee.com/openeuler/oec-hardware/pulls/306) + # 1.1.7 Release announcement ## New @@ -13,4 +28,4 @@ * [Update test_guide doc](https://gitee.com/openeuler/oec-hardware/pulls/282) * [Update pci.ids](https://gitee.com/openeuler/oec-hardware/pulls/284) * [Update the design doc of oech and add comments of main module](https://gitee.com/openeuler/oec-hardware/pulls/289) -* [Add the raid test identification of PM8222-SHBA](https://gitee.com/openeuler/oec-hardware/pulls/288) \ No newline at end of file +* [Add the raid test identification of PM8222-SHBA](https://gitee.com/openeuler/oec-hardware/pulls/288) diff --git a/oec-hardware-1.1.7-1-fix-bugs-and-add-kylinsec353.patch b/oec-hardware-1.1.7-1-fix-bugs-and-add-kylinsec353.patch new file mode 100644 index 0000000..5fada4b --- /dev/null +++ b/oec-hardware-1.1.7-1-fix-bugs-and-add-kylinsec353.patch @@ -0,0 +1,126 @@ +diff -Naur rpm/hwcompatible/cert_info.py oech/hwcompatible/cert_info.py +--- rpm/hwcompatible/cert_info.py 2025-01-06 14:33:33.000000000 +0800 ++++ oech/hwcompatible/cert_info.py 2025-05-15 08:48:24.522861015 +0800 +@@ -73,7 +73,7 @@ + "grep openeulerversion /etc/openEuler-latest | cut -d '=' -f 2", log_print=False) + os_version = os_cmd[0].strip("\n").replace('-', ' ') + oec_json["os"] = os_version +- curday = date.today().strftime("%Y.%m.%d") ++ curday = date.today().strftime("%Y-%m-%d") + oec_json["date"] = curday + filename = self.command.run_cmd( + "modinfo %s | grep filename | awk '{print $2}'" % device.driver, log_print=False) +diff -Naur rpm/README.md oech/README.md +--- rpm/README.md 2025-01-06 14:33:33.000000000 +0800 ++++ oech/README.md 2025-05-15 08:48:24.518860998 +0800 +@@ -220,6 +220,7 @@ + |ethernet|√|√|| + |fc||√|| + |gpu||√|| ++|vgpu|||| + |ipmi|√||| + |infiniband||√|| + |kabi|√|√|| +@@ -228,10 +229,12 @@ + |keycard||√|| + |memory|√||| + |nvme||√|| ++|spdk|||| + |perf|√||| + |raid|√|√|| + |usb|√||| + |watchdog|√||| ++|srpm|||| + |qemu_001|||√| + |qemu_003|||√| + |qemu_005|||√| +diff -Naur rpm/scripts/kernelrelease.json oech/scripts/kernelrelease.json +--- rpm/scripts/kernelrelease.json 2025-01-06 14:33:33.000000000 +0800 ++++ oech/scripts/kernelrelease.json 2025-05-15 08:48:24.522861015 +0800 +@@ -18,6 +18,7 @@ + "345": "openEuler-20.03-LTS-SP3/4.19.90-2112.8.0.0131.oe1", + "351": "openEuler-22.03-LTS/5.10.0-60.18.0.50.oe2203", + "352": "openEuler-22.03-LTS-SP2/5.10.0-153.12.0.92.oe2203sp2", ++ "353": "openEuler-22.03-LTS-SP4/5.10.0-216.0.0.115.oe2203sp4", + "361": "openEuler-24.03-LTS/6.6.0-28.0.0.34.oe2403" + }, + "Kylin": { +diff -Naur rpm/tests/compatible/disk/common.py oech/tests/compatible/disk/common.py +--- rpm/tests/compatible/disk/common.py 2025-01-06 14:33:33.000000000 +0800 ++++ oech/tests/compatible/disk/common.py 2025-05-15 08:48:24.525861027 +0800 +@@ -146,7 +146,7 @@ + if not os.path.exists(proc_path): + proc_path = os.path.join("/sys/block/*/", disk) + size = getoutput("cat %s/size" % proc_path) +- size = int(size) / 2 / 2 ++ size = int(size) / 2 + if size <= 0: + logger.error( + "Device %s size is not suitable for testing." % device) +diff -Naur rpm/tests/compatible/network/network.py oech/tests/compatible/network/network.py +--- rpm/tests/compatible/network/network.py 2025-01-06 14:33:33.000000000 +0800 ++++ oech/tests/compatible/network/network.py 2025-05-15 08:48:24.525861027 +0800 +@@ -136,6 +136,7 @@ + :return: + """ + self.command.run_cmd("ip link set down %s" % interface) ++ time.sleep(5) + for _ in range(10): + result = self.command.run_cmd( + "ip link show %s | grep 'state DOWN'" % interface, ignore_errors=False) +@@ -143,7 +144,7 @@ + self.logger.info("Set interface %s down succeed." % self.interface) + return True + time.sleep(1) +- ++ + self.logger.error("Set interface %s down failed." % self.interface) + return False + +diff -Naur rpm/tests/compatible/srpm/srpm.py oech/tests/compatible/srpm/srpm.py +--- rpm/tests/compatible/srpm/srpm.py 2025-01-06 14:33:33.000000000 +0800 ++++ oech/tests/compatible/srpm/srpm.py 2025-05-15 08:48:24.525861027 +0800 +@@ -54,7 +54,7 @@ + for line in srpms_repo.split("\n"): + src_info = line.split() + if len(src_info) != 3: +- self.logger.debug("abnormal source rpm info line: %s" % line) ++ self.logger.info("abnormal source rpm info line: %s" % line) + continue + src_name = src_info[0].split('.')[0] + version = src_info[1].split('-')[0].split(':')[-1] +diff -Naur rpm/tests/compatible/vgpu/test_vgpu.sh oech/tests/compatible/vgpu/test_vgpu.sh +--- rpm/tests/compatible/vgpu/test_vgpu.sh 2025-01-06 14:33:33.000000000 +0800 ++++ oech/tests/compatible/vgpu/test_vgpu.sh 2025-05-15 08:48:24.525861027 +0800 +@@ -41,7 +41,7 @@ + sed -i "s#test_uuid#${uuid}#" /opt/${vmfile} + virsh define /opt/${vmfile} + virsh start openEulerVM +- sleep 60 ++ sleep 90 + return 0 + } + +@@ -101,6 +101,13 @@ + return 1 + fi + ++ echo "Remove the nouveau module." ++ testcmd="modprobe -r nouveau" ++ sshcmd $vm_ip $passwd "${testcmd}" ++ if [[ $? -ne 0 ]]; then ++ return 1 ++ fi ++ + echo "Start to install driver." + install_cmd="bash ${vm_driver} --disable-nouveau --ui=none --no-questions" + sshcmd $vm_ip $passwd "${install_cmd}" +@@ -175,7 +182,7 @@ + ip=$1 + passwd=$2 + cmd=$3 +- timeout=600 ++ timeout=1200 + expect <<-SSHEOF + set timeout $timeout + spawn ssh -o "ConnectTimeout=${timeout}" root@${ip} "${cmd}" diff --git a/oec-hardware.spec b/oec-hardware.spec index b491ce5..34a3d79 100644 --- a/oec-hardware.spec +++ b/oec-hardware.spec @@ -6,13 +6,14 @@ Name: oec-hardware Summary: openEuler Hardware Compatibility Test Suite Version: 1.1.7 -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.7-1-fix-bugs-and-add-kylinsec353.patch Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gcc @@ -36,6 +37,7 @@ openEuler Hardware Compatibility Test Server %prep %setup -q -c +%patch1 -p1 %build %ifarch x86_64 aarch64 @@ -83,6 +85,15 @@ sed -i 's#grep openeulerversion /etc/openEuler-latest#grep %{vendor_lowercase}ve rm -rf /var/lock/oech.lock %changelog +* Thu May 15 2025 xiaochn - 1.1.7-1 +- Add KylinSec 3.5.3 support +- Fix the problem of disk size calculation +- Fix bcm57414 nic test failed issue +- Change the format of date +- Fixed a bug where a non-existent logger level was used +- Update README.md +- Fix vgpu testing issue + * Mon Jan 06 2025 wangshuai - 1.1.7-0 - Add kernel support for openEuler 24.03 LTS SP1 - GPU test suite optimize -- Gitee