Move memory_stress_ng from "memory" category to "stress" category (Bu…

…gfix) (#677) Modify: move memory_stress_ng from the category memory to stress
canonical · Dec 21, 2023 · 4310d65 · 4310d65
1 parent cd53145
commit 4310d65
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 25 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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_.*