From 8b9336cc7463fc60f84761e884ecd1ebeb460312 Mon Sep 17 00:00:00 2001 From: LiaoU3 <58060146+LiaoU3@users.noreply.github.com> Date: Thu, 21 Dec 2023 08:56:20 +0800 Subject: [PATCH] Move memory_stress_ng from "memory" category to "stress" category (Bugfix) (#677) Modify: move memory_stress_ng from the category memory to stress --- providers/base/units/memory/jobs.pxu | 15 --------------- providers/base/units/memory/test-plan.pxu | 2 +- providers/base/units/stress/jobs.pxu | 16 ++++++++++++++++ providers/base/units/stress/test-plan.pxu | 2 +- .../configs/canonical-certification.conf | 2 +- .../certification-server/units/packaging.pxu | 2 +- .../units/server-full-20.04.pxu | 2 +- .../units/server-soc-cert-20.04.pxu | 2 +- .../units/server-ubuntucore-20.pxu | 2 +- .../units/virtual-machine-full-20.04.pxu | 2 +- providers/sru/units/sru.pxu | 4 ++-- 11 files changed, 26 insertions(+), 25 deletions(-) diff --git a/providers/base/units/memory/jobs.pxu b/providers/base/units/memory/jobs.pxu index f3d91f0786..e2761f539e 100644 --- a/providers/base/units/memory/jobs.pxu +++ b/providers/base/units/memory/jobs.pxu @@ -39,18 +39,3 @@ _siblings: [ "depends": "com.canonical.certification::suspend/suspend_advanced_auto"} ] -plugin: shell -category_id: com.canonical.plainbox::memory -id: memory/memory_stress_ng -estimated_duration: 11000.0 -user: root -environ: STRESS_NG_MIN_SWAP_SIZE -requires: - executable.name == 'stress-ng' -command: systemd-inhibit stress_ng_test.py memory -_summary: Stress test of system memory -_description: - Test to perform some basic stress and exercise of system memory via the - stress_ng tool. This test also includes an over-commit function to force - swapping to disk, thus SUTs should have suitably large swap files for the - amount of RAM they have installed. diff --git a/providers/base/units/memory/test-plan.pxu b/providers/base/units/memory/test-plan.pxu index 6ff0e93b0b..532c2818c4 100644 --- a/providers/base/units/memory/test-plan.pxu +++ b/providers/base/units/memory/test-plan.pxu @@ -25,4 +25,4 @@ _name: Automated memory tests _desctiption: Automated memory tests for Server Cert include: memory/info certification-status=blocker - memory/memory_stress_ng certification-status=blocker + stress/memory_stress_ng certification-status=blocker diff --git a/providers/base/units/stress/jobs.pxu b/providers/base/units/stress/jobs.pxu index e0271eca00..12871b9d15 100644 --- a/providers/base/units/stress/jobs.pxu +++ b/providers/base/units/stress/jobs.pxu @@ -35,6 +35,22 @@ _description: several hours. The test is considered passed if the system does not freeze and if the stress_ng tool does not report errors. +plugin: shell +category_id: com.canonical.plainbox::stress +id: stress/memory_stress_ng +estimated_duration: 11000.0 +user: root +environ: STRESS_NG_MIN_SWAP_SIZE +requires: + executable.name == 'stress-ng' +command: systemd-inhibit stress_ng_test.py memory +_summary: Stress test of system memory +_description: + Test to perform some basic stress and exercise of system memory via the + stress_ng tool. This test also includes an over-commit function to force + swapping to disk, thus SUTs should have suitably large swap files for the + amount of RAM they have installed. + plugin: shell category_id: com.canonical.plainbox::stress id: power-management/hibernate_30_cycles diff --git a/providers/base/units/stress/test-plan.pxu b/providers/base/units/stress/test-plan.pxu index dd2884d0bf..2fe5978263 100644 --- a/providers/base/units/stress/test-plan.pxu +++ b/providers/base/units/stress/test-plan.pxu @@ -101,7 +101,7 @@ _description: Stress NG tests (automated) include: stress/store_and_change_oomd_config stress/cpu_stress_ng_test certification-status=blocker - memory/memory_stress_ng certification-status=blocker + stress/memory_stress_ng certification-status=blocker stress/restore_oomd_config id: stress-warmboot-coldboot-automated diff --git a/providers/certification-server/configs/canonical-certification.conf b/providers/certification-server/configs/canonical-certification.conf index 34e93204d2..a6bb620b01 100644 --- a/providers/certification-server/configs/canonical-certification.conf +++ b/providers/certification-server/configs/canonical-certification.conf @@ -83,7 +83,7 @@ DISK_MDADM_READ_PERF = 150 #LXD_TEMPLATE = http://server_url/path/to/jammy-server-cloudimg-amd64-lxd.tar.xz # The STRESS_NG_MIN_SWAP_SIZE environment variable sets the minimum swap -# space, in gibibytes (GiB), that the memory/memory_stress_ng test requires. +# space, in gibibytes (GiB), that the stress/memory_stress_ng test requires. # If less than the specified swap space is available, the script will # attempt to create a swap file of the required size. If that attempt fails, # the memory stress test will fail. diff --git a/providers/certification-server/units/packaging.pxu b/providers/certification-server/units/packaging.pxu index 930cc28a75..925eef4e16 100644 --- a/providers/certification-server/units/packaging.pxu +++ b/providers/certification-server/units/packaging.pxu @@ -1,4 +1,4 @@ -# The 'memory/memory_stress_ng' job requires numactl +# The 'stress/memory_stress_ng' job requires numactl unit: packaging meta-data os-id: debian Depends: numactl diff --git a/providers/certification-server/units/server-full-20.04.pxu b/providers/certification-server/units/server-full-20.04.pxu index 2d90f0c0bc..1b99671986 100644 --- a/providers/certification-server/units/server-full-20.04.pxu +++ b/providers/certification-server/units/server-full-20.04.pxu @@ -27,7 +27,7 @@ include: disk/disk_cpu_load_.* certification-status=non-blocker networking/predictable_names certification-status=non-blocker memory/info certification-status=blocker - memory/memory_stress_ng certification-status=blocker + stress/memory_stress_ng certification-status=blocker power-management/rtc certification-status=blocker stress/cpu_stress_ng_test certification-status=blocker virtualization/verify_lxd certification-status=blocker diff --git a/providers/certification-server/units/server-soc-cert-20.04.pxu b/providers/certification-server/units/server-soc-cert-20.04.pxu index 4910e53bce..66c3b35555 100644 --- a/providers/certification-server/units/server-soc-cert-20.04.pxu +++ b/providers/certification-server/units/server-soc-cert-20.04.pxu @@ -25,7 +25,7 @@ include: disk/disk_cpu_load_.* certification-status=non-blocker networking/predictable_names certification-status=non-blocker memory/info certification-status=blocker - memory/memory_stress_ng certification-status=blocker + stress/memory_stress_ng certification-status=blocker power-management/rtc certification-status=blocker stress/cpu_stress_ng_test certification-status=blocker virtualization/verify_lxd certification-status=blocker diff --git a/providers/certification-server/units/server-ubuntucore-20.pxu b/providers/certification-server/units/server-ubuntucore-20.pxu index 4ac8e2f8b8..19d86f1d57 100644 --- a/providers/certification-server/units/server-ubuntucore-20.pxu +++ b/providers/certification-server/units/server-ubuntucore-20.pxu @@ -31,7 +31,7 @@ include: disk/disk_cpu_load_.* certification-status=non-blocker networking/predictable_names certification-status=non-blocker memory/info certification-status=blocker - memory/memory_stress_ng certification-status=blocker + stress/memory_stress_ng certification-status=blocker power-management/rtc certification-status=blocker stress/cpu_stress_ng_test certification-status=blocker usb/detect certification-status=non-blocker diff --git a/providers/certification-server/units/virtual-machine-full-20.04.pxu b/providers/certification-server/units/virtual-machine-full-20.04.pxu index 28b7cd6027..4957487595 100644 --- a/providers/certification-server/units/virtual-machine-full-20.04.pxu +++ b/providers/certification-server/units/virtual-machine-full-20.04.pxu @@ -25,7 +25,7 @@ include: disk/disk_cpu_load_.* certification-status=non-blocker networking/predictable_names certification-status=non-blocker memory/info certification-status=blocker - memory/memory_stress_ng certification-status=blocker + stress/memory_stress_ng certification-status=blocker power-management/rtc certification-status=blocker stress/cpu_stress_ng_test certification-status=blocker virtualization/verify_lxd certification-status=blocker diff --git a/providers/sru/units/sru.pxu b/providers/sru/units/sru.pxu index 0fe159731c..b348ae991c 100644 --- a/providers/sru/units/sru.pxu +++ b/providers/sru/units/sru.pxu @@ -109,7 +109,7 @@ exclude: disk/stats_.* disk/storage_device_.* installer_debug.gz - memory/memory_stress_ng + stress/memory_stress_ng audio/valid-sof-firmware-sig miscellanea/check_prerelease suspend/bluetooth_obex_.* @@ -172,7 +172,7 @@ exclude: disk/stats_.* disk/storage_device_.* installer_debug.gz - memory/memory_stress_ng + stress/memory_stress_ng audio/valid-sof-firmware-sig miscellanea/check_prerelease suspend/bluetooth_obex_.*