Revert "test: pin stress-ng --vm-method to a portable scalar method in TEST-55-OOMD"

This reverts commit 881e4717c7981b274853309e68b39153e3b292f4.

diff --git a/test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testbloat.service b/test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testbloat.service
index 22bbd210e96f5d378751095ab4eb1d5cb34d7de0..70c87727c8b102d7592aab75d64b797c321d226e 100644 (file)
--- a/test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testbloat.service
+++ b/test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testbloat.service
@@ -7,7 +7,4 @@ Description=Create a lot of memory pressure
 # to throttle and be put under heavy pressure.
 MemoryHigh=3M
 Slice=TEST-55-OOMD-workload.slice
-# Pin --vm-method to a portable method (zero-one): the default 'all' cycles
-# through methods, including newer ones using AVX-512 instructions that SIGILL
-# on CPUs without AVX-512 (e.g. AMD Zen 1-3), making the test flaky.
-ExecStart=stress-ng --timeout 3m --vm 10 --vm-bytes 200M --vm-keep --vm-method=zero-one
+ExecStart=stress-ng --timeout 3m --vm 10 --vm-bytes 200M --vm-keep

diff --git a/test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testmunch.service b/test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testmunch.service
index 06eea10b79a55e6be3d1f9c36520d5c938fc611d..79bd01838e142bf61bad149c664af5be5e112174 100644 (file)
--- a/test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testmunch.service
+++ b/test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testmunch.service
@@ -5,7 +5,4 @@ Description=Create some memory pressure
 [Service]
 MemoryHigh=12M
 Slice=TEST-55-OOMD-workload.slice
-# Pin --vm-method to a portable method (zero-one): the default 'all' cycles
-# through methods, including newer ones using AVX-512 instructions that SIGILL
-# on CPUs without AVX-512 (e.g. AMD Zen 1-3), making the test flaky.
-ExecStart=stress-ng --timeout 3m --vm 10 --vm-bytes 200M --vm-keep --vm-method=zero-one
+ExecStart=stress-ng --timeout 3m --vm 10 --vm-bytes 200M --vm-keep

diff --git a/test/units/TEST-55-OOMD.sh b/test/units/TEST-55-OOMD.sh
index b7311e83dca4eb3155e89a69df1803b9f73d40af..6689bbdd733c9abd9732aafa80acf4f5eda3a91c 100755 (executable)
--- a/test/units/TEST-55-OOMD.sh
+++ b/test/units/TEST-55-OOMD.sh
@@ -365,14 +365,11 @@ EOF
 
     systemctl reload systemd-oomd.service
 
-    # Run a transient service with OOMRules=testrule that generates memory pressure.
-    # Pin --vm-method to a portable method (zero-one): the default 'all' cycles
-    # through every method, including newer ones using AVX-512 instructions that
-    # SIGILL on CPUs without AVX-512 (e.g. AMD Zen 1-3), making the test flaky.
+    # Run a transient service with OOMRules=testrule that generates memory pressure
     (! systemd-run --wait --unit=TEST-55-OOMD-testrules \
         -p MemoryHigh=3M \
         -p OOMRules=testrule \
-        stress-ng --timeout 3m --vm 10 --vm-bytes 50M --vm-keep --vm-method=zero-one)
+        stress-ng --timeout 3m --vm 10 --vm-bytes 50M --vm-keep)
 
     # Verify in the journal that the rule triggered
     journalctl --sync
@@ -457,14 +454,10 @@ EOF
 
     # Start the unit without --wait so we can check mid-run state. The
     # stress-ng timeout bounds the test if anything goes wrong.
-    # Pin --vm-method to a portable method (zero-one): the default 'all' cycles
-    # through every method, including newer ones using AVX-512 instructions that
-    # SIGILL on CPUs without AVX-512 (e.g. AMD Zen 1-3) and would cause stress-ng
-    # to exit before the 6 s wait below elapses, failing the ActiveState check.
     systemd-run --unit=TEST-55-OOMD-slowrule \
         -p MemoryHigh=3M \
         -p OOMRules=slowrule \
-        stress-ng --timeout 15s --vm 10 --vm-bytes 50M --vm-keep --vm-method=zero-one
+        stress-ng --timeout 15s --vm 10 --vm-bytes 50M --vm-keep
 
     # Wait long enough for oomd's 1s rule-check loop to evaluate the condition
     # many times. With LastingSec=1h the kill must not fire.