From eeade026b281f7011ed5141be0efa05e7d309770 Mon Sep 17 00:00:00 2001
From: Richard Top <richard.topouchian@uib.no>
Date: Tue, 11 Jun 2024 13:00:53 +0000
Subject: [PATCH 1/2] {2023.06}[gompi/2023b] Valgrind V3.21.0

---
 .../pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023b.yml    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023b.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023b.yml
index 03da218a78..b2f5a75627 100644
--- a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023b.yml
+++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023b.yml
@@ -26,3 +26,6 @@ easyconfigs:
   - IPython-8.17.2-GCCcore-13.2.0.eb
   - Qt5-5.15.13-GCCcore-13.2.0.eb
   - NLTK-3.8.1-foss-2023b.eb
+  - Valgrind-3.23.0-gompi-2023b.eb:
+      options:
+        from-pr: 20792

From 1ce68199ec5fa9b8268feaf14cdd97e7b8e8411e Mon Sep 17 00:00:00 2001
From: Richard Top <richard.topouchian@uib.no>
Date: Mon, 17 Jun 2024 09:10:14 +0000
Subject: [PATCH 2/2] Use default memory option during reframe tests

---
 test_suite.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test_suite.sh b/test_suite.sh
index 7c24aa5a56..59407f49cb 100755
--- a/test_suite.sh
+++ b/test_suite.sh
@@ -177,7 +177,8 @@ sed -i "s/__NUM_CPUS__/${cpu_count}/g" $RFM_CONFIG_FILES
 sed -i "s/__NUM_SOCKETS__/${socket_count}/g" $RFM_CONFIG_FILES
 sed -i "s/__NUM_CPUS_PER_CORE__/${threads_per_core}/g" $RFM_CONFIG_FILES
 sed -i "s/__NUM_CPUS_PER_SOCKET__/${cores_per_socket}/g" $RFM_CONFIG_FILES
-sed -i "s/__MEM_PER_NODE__/${cgroup_mem_mib}/g" $RFM_CONFIG_FILES
+# on local systems the change below is not the case, it works on AWS
+# sed -i "s/__MEM_PER_NODE__/${cgroup_mem_mib}/g" $RFM_CONFIG_FILES
 
 # Workaround for https://github.com/EESSI/software-layer/pull/467#issuecomment-1973341966
 export PSM3_DEVICES='self,shm'  # this is enough, since we only run single node for now