File 0001-TEST-55-OOMD-fix-for-v255.patch of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-TEST-55-OOMD-fix-for-v255.patch of Package systemd

From 6a91bb8373a5b5ac1a87ef76a65e2df26ccc3606 Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume@suse.com>
Date: Thu, 15 Feb 2024 17:35:31 +0100
Subject: [PATCH 1/2] TEST-55-OOMD fix for v255

---
 test/TEST-55-OOMD/test.sh                 | 10 ++++++++--
 test/units/testsuite-55-testbloat.service |  2 +-
 test/units/testsuite-55-testmunch.service |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/TEST-55-OOMD/test.sh b/test/TEST-55-OOMD/test.sh
index 64e2360b08..274ea90c87 100755
--- a/test/TEST-55-OOMD/test.sh
+++ b/test/TEST-55-OOMD/test.sh
@@ -8,15 +8,21 @@ IMAGE_NAME="oomd"
 # Need to set up swap
 TEST_NO_NSPAWN=1
 
+# enable /proc/pressure
+KERNEL_APPEND="psi=1 $KERNEL_APPEND"
+
 # shellcheck source=test/test-functions
 . "${TEST_BASE_DIR:?}/test-functions"
 
 test_append_files() {
     # Create a swap file
     (
-        image_install mkswap swapon swapoff stress
+        image_install mkswap swapon swapoff stress-ng
 
-        dd if=/dev/zero of="${initdir:?}/swapfile" bs=1M count=48
+        mkdir ${initdir:?}/swapdir
+        chattr +C ${initdir:?}/swapdir
+        dd if=/dev/zero of="${initdir:?}/swapdir/swapfile" bs=1M count=48
+        mv "${initdir:?}/swapdir/swapfile" ${initdir:?}/swapfile
         chmod 0600 "${initdir:?}/swapfile"
 
         mkdir -p "${initdir:?}/etc/systemd/system/init.scope.d/"
diff --git a/test/units/testsuite-55-testbloat.service b/test/units/testsuite-55-testbloat.service
index 6c8e3c93ac..f8113e4c0b 100644
--- a/test/units/testsuite-55-testbloat.service
+++ b/test/units/testsuite-55-testbloat.service
@@ -7,4 +7,4 @@ Description=Create a lot of memory pressure
 # to throttle and be put under heavy pressure.
 MemoryHigh=3M
 Slice=testsuite-55-workload.slice
-ExecStart=stress --timeout 3m --vm 10 --vm-bytes 200M --vm-keep --vm-stride 1
+ExecStart=stress-ng --timeout 3m --vm 10 --vm-bytes 200M --vm-keep
diff --git a/test/units/testsuite-55-testmunch.service b/test/units/testsuite-55-testmunch.service
index 3730059797..f7d703d4aa 100644
--- a/test/units/testsuite-55-testmunch.service
+++ b/test/units/testsuite-55-testmunch.service
@@ -5,4 +5,4 @@ Description=Create some memory pressure
 [Service]
 MemoryHigh=12M
 Slice=testsuite-55-workload.slice
-ExecStart=stress --timeout 3m --vm 10 --vm-bytes 200M --vm-keep --vm-stride 1
+ExecStart=stress-ng --timeout 3m --vm 10 --vm-bytes 200M --vm-keep
-- 
2.43.0

Places

File 0001-TEST-55-OOMD-fix-for-v255.patch of Package systemd

Places