diff --git a/docs/Release_announcement/oec-hardware-1.1.4-release-announcement.md b/docs/Release_announcement/oec-hardware-1.1.4-release-announcement.md deleted file mode 100644 index 914ada74c1772e986a2553969db1b46558072a86..0000000000000000000000000000000000000000 --- a/docs/Release_announcement/oec-hardware-1.1.4-release-announcement.md +++ /dev/null @@ -1,29 +0,0 @@ -# 1.1.4-0 版本更新公告 - -## 问题修复 - -* [修复disk测试提示pci_num没有定义问题](https://gitee.com/openeuler/oec-hardware/pulls/166) -* [自动删除服务器ip行为,将其更改为由用户手动删除](https://gitee.com/openeuler/oec-hardware/pulls/168) -* [修改驱动的sha256获取方式](https://gitee.com/openeuler/oec-hardware/pulls/169) -* [修改网卡测试项里的日志记录信息](https://gitee.com/openeuler/oec-hardware/pulls/169) -* [修改错误的import](https://gitee.com/openeuler/oec-hardware/pulls/169) -* [解决光盘测试中出现的部分问题](https://gitee.com/openeuler/oec-hardware/pulls/170) -* [解决nvme用例测试中获取块大小失败问题](https://gitee.com/openeuler/oec-hardware/pulls/174) -* [memory日志格式修正,将error修改为info](https://gitee.com/openeuler/oec-hardware/pulls/175) -* [修复kabi测试用例在openEuler 22.03 LTS SP1系统上获取kernel.src值不正确的问题](https://gitee.com/openeuler/oec-hardware/pulls/176) -* [修复libswsds.so未被剥离的问题](https://gitee.com/openeuler/oec-hardware/pulls/177) - - -## 新增内容 - -* [基于服务器架构判断是否支持进行kabi测试](https://gitee.com/openeuler/oec-hardware/pulls/172) -* [在测试报告中新增几项板卡信息](https://gitee.com/openeuler/oec-hardware/pulls/178) -* [添加spdk测试用例](https://gitee.com/openeuler/oec-hardware/pulls/179) -* [添加spdk测试用例对应描述](https://gitee.com/openeuler/oec-hardware/pulls/187) -* [添加dpdk测试用例](https://gitee.com/openeuler/oec-hardware/pulls/180) -* [添加oec-hardware客户端依赖qperf、添加dpdk测试用例对应描述](https://gitee.com/openeuler/oec-hardware/pulls/191) -* [添加上游新增芯片信息及板卡信息](https://gitee.com/openeuler/oec-hardware/pulls/190) - -## 预期更新内容 - -* 暂定 diff --git a/docs/Release_announcement/oec-hardware-1.1.6-release-announcement.md b/docs/Release_announcement/oec-hardware-1.1.6-release-announcement.md deleted file mode 100644 index 899f7b2005530fd6adb567034e4a1d194c2e3995..0000000000000000000000000000000000000000 --- a/docs/Release_announcement/oec-hardware-1.1.6-release-announcement.md +++ /dev/null @@ -1,29 +0,0 @@ -# 1.1.6-4 Patch Update Contents - -## Bug Fixes -* [Kdump test suite fix](https://gitee.com/openeuler/oec-hardware/pulls/296) - -# 1.1.6-3 Patch Update Contents - -## Bug Fixes -* [Remove unused variable in cdrom test suite](https://gitee.com/openeuler/oec-hardware/pulls/281) -* [Optimize the display judgement of gpu and unify the location for downloading kernel source RPMs etc.](https://gitee.com/openeuler/oec-hardware/pulls/291) - -## Optimization -* [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) - -# 1.1.6-2 Patch Update Contents - -## Bug Fixes -* [Optimize "show_hugepages" function in dpdk test suite](https://gitee.com/openeuler/oec-hardware/pulls/287) - -# 1.1.6-1 Patch Update Contents - -## Addtions -* [Add the raid test identification of PM8222-SHBA](https://gitee.com/openeuler/oec-hardware/pulls/288) -# 1.1.6 Release announcement - - - 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 d814163511fcf299ce59bbb3cc8e96f5e13d8440..fbe54e05c0f2b4ee475b94f32b013771dee40150 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,31 +1,94 @@ -# 1.1.7-1 Patch Update Contents +# Oec-hardware Release Announcement -## New +## 1.1.8-1 Update Contents + +### New + +* [add kernel support of openEuler 24.03 LTS SP2](https://gitee.com/openeuler/oec-hardware/pulls/314/files) + +## 1.1.7-1 Patch Update Contents + +### New * [add KylinSec 3.5.3 support](https://gitee.com/openeuler/oec-hardware/pulls/313) -## Bug Fixes +### 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 +### 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 +## 1.1.7 Update Contents -## New +### New * [add kernel support for openEuler 24.03 LTS SP1](https://gitee.com/openeuler/oec-hardware/pulls/297) -## Bug Fixes +### Bug Fixes * [GPU test suite fix](https://gitee.com/openeuler/oec-hardware/pulls/303) * [Kdump test suite fix](https://gitee.com/openeuler/oec-hardware/pulls/296) * [Remove unused variable in cdrom test suite](https://gitee.com/openeuler/oec-hardware/pulls/281) * [Optimize the display judgement of gpu and unify the location for downloading kernel source RPMs etc.](https://gitee.com/openeuler/oec-hardware/pulls/291) * [Optimize "show_hugepages" function in dpdk test suite](https://gitee.com/openeuler/oec-hardware/pulls/287) -## Optimization +### Optimization * [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) + +## 1.1.6-4 Patch Update Contents + +### Bug Fixes +* [Kdump test suite fix](https://gitee.com/openeuler/oec-hardware/pulls/296) + +## 1.1.6-3 Patch Update Contents + +### Bug Fixes +* [Remove unused variable in cdrom test suite](https://gitee.com/openeuler/oec-hardware/pulls/281) +* [Optimize the display judgement of gpu and unify the location for downloading kernel source RPMs etc.](https://gitee.com/openeuler/oec-hardware/pulls/291) + +### Optimization +* [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) + +## 1.1.6-2 Patch Update Contents + +### Bug Fixes +* [Optimize "show_hugepages" function in dpdk test suite](https://gitee.com/openeuler/oec-hardware/pulls/287) + +## 1.1.6-1 Patch Update Contents + +### Addtions +* [Add the raid test identification of PM8222-SHBA](https://gitee.com/openeuler/oec-hardware/pulls/288) + +## 1.1.6 Release Update Contents + + +## 1.1.4-0 版本更新公告 + +### 问题修复 + +* [修复disk测试提示pci_num没有定义问题](https://gitee.com/openeuler/oec-hardware/pulls/166) +* [自动删除服务器ip行为,将其更改为由用户手动删除](https://gitee.com/openeuler/oec-hardware/pulls/168) +* [修改驱动的sha256获取方式](https://gitee.com/openeuler/oec-hardware/pulls/169) +* [修改网卡测试项里的日志记录信息](https://gitee.com/openeuler/oec-hardware/pulls/169) +* [修改错误的import](https://gitee.com/openeuler/oec-hardware/pulls/169) +* [解决光盘测试中出现的部分问题](https://gitee.com/openeuler/oec-hardware/pulls/170) +* [解决nvme用例测试中获取块大小失败问题](https://gitee.com/openeuler/oec-hardware/pulls/174) +* [memory日志格式修正,将error修改为info](https://gitee.com/openeuler/oec-hardware/pulls/175) +* [修复kabi测试用例在openEuler 22.03 LTS SP1系统上获取kernel.src值不正确的问题](https://gitee.com/openeuler/oec-hardware/pulls/176) +* [修复libswsds.so未被剥离的问题](https://gitee.com/openeuler/oec-hardware/pulls/177) + + +### 新增内容 + +* [基于服务器架构判断是否支持进行kabi测试](https://gitee.com/openeuler/oec-hardware/pulls/172) +* [在测试报告中新增几项板卡信息](https://gitee.com/openeuler/oec-hardware/pulls/178) +* [添加spdk测试用例](https://gitee.com/openeuler/oec-hardware/pulls/179) +* [添加spdk测试用例对应描述](https://gitee.com/openeuler/oec-hardware/pulls/187) +* [添加dpdk测试用例](https://gitee.com/openeuler/oec-hardware/pulls/180) +* [添加oec-hardware客户端依赖qperf、添加dpdk测试用例对应描述](https://gitee.com/openeuler/oec-hardware/pulls/191) +* [添加上游新增芯片信息及板卡信息](https://gitee.com/openeuler/oec-hardware/pulls/190) \ No newline at end of file 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 deleted file mode 100644 index 5fada4b34395ab643df59ea7b81c5e6bbbee00e4..0000000000000000000000000000000000000000 --- a/oec-hardware-1.1.7-1-fix-bugs-and-add-kylinsec353.patch +++ /dev/null @@ -1,126 +0,0 @@ -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 34a3d7974ab6d8f05d87b1a223e8cbf1c8c07010..66b4c85e5fd01dc2b1b8047938b76b3d10d1f0de 100644 --- a/oec-hardware.spec +++ b/oec-hardware.spec @@ -5,15 +5,14 @@ Name: oec-hardware Summary: openEuler Hardware Compatibility Test Suite -Version: 1.1.7 +Version: 1.1.8 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 +# patch Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gcc @@ -36,8 +35,7 @@ openEuler Hardware Compatibility Test Suite openEuler Hardware Compatibility Test Server %prep -%setup -q -c -%patch1 -p1 +%autosetup -n oec-hardware-v%{version} %build %ifarch x86_64 aarch64 @@ -85,6 +83,9 @@ sed -i 's#grep openeulerversion /etc/openEuler-latest#grep %{vendor_lowercase}ve rm -rf /var/lock/oech.lock %changelog +* Thu Jun 26 2025 WANG-shine - 1.1.8-1 +- Add kernel support of openeEuler 24.03 LTS SP2 + * Thu May 15 2025 xiaochn - 1.1.7-1 - Add KylinSec 3.5.3 support - Fix the problem of disk size calculation diff --git a/v1.1.7.tar.gz b/v1.1.8.tar.gz similarity index 38% rename from v1.1.7.tar.gz rename to v1.1.8.tar.gz index b5475af10164130aef231776ec20dea75e8397ce..2e1aaf50a1bc4f25b5bb6a58b4e193084b4c53fb 100644 Binary files a/v1.1.7.tar.gz and b/v1.1.8.tar.gz differ