From cc4e2c03421f52a8be699adeed35dccac04266db Mon Sep 17 00:00:00 2001
From: Tim Kok <tim.kok@surf.nl>
Date: Mon, 30 Oct 2023 17:46:40 +0100
Subject: [PATCH 1/2] {2023.06} EasyBuild v4.8.2 + attempt module loads without
 cache

---
 eessi-2023.06-eb-4.8.1-system.yml |  3 +++
 load_easybuild_module.sh          | 31 +++++++++++++++++++------------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/eessi-2023.06-eb-4.8.1-system.yml b/eessi-2023.06-eb-4.8.1-system.yml
index 1e9664e10f..3d0e1c3c32 100644
--- a/eessi-2023.06-eb-4.8.1-system.yml
+++ b/eessi-2023.06-eb-4.8.1-system.yml
@@ -4,3 +4,6 @@ easyconfigs:
   - ReFrame-4.3.3.eb:
       options:
         from-pr: 18851
+  - EasyBuild-4.8.2.eb:
+      options:
+        from-pr: 19101
diff --git a/load_easybuild_module.sh b/load_easybuild_module.sh
index 4ff2a3c37c..d1bfd18bb5 100755
--- a/load_easybuild_module.sh
+++ b/load_easybuild_module.sh
@@ -23,14 +23,14 @@ fi
 EB_VERSION=${1}
 
 # make sure that environment variables that we expect to be set are indeed set
-if [ -z "${TMPDIR}" ]; then 
+if [ -z "${TMPDIR}" ]; then
     echo "\$TMPDIR is not set" >&2
     exit 2
 fi
 
 # ${EB} is used to specify which 'eb' command should be used;
 # can potentially be more than just 'eb', for example when using 'eb --optarch=GENERIC'
-if [ -z "${EB}" ]; then 
+if [ -z "${EB}" ]; then
     echo "\$EB is not set" >&2
     exit 2
 fi
@@ -71,21 +71,28 @@ else
     check_exit_code $? "${ok_msg}" "${fail_msg}"
 
     # maybe the module obtained with --install-latest-eb-release is exactly the EasyBuild version we wanted?
+    IGNORE_CACHE=''
     module avail 2>&1 | grep -i easybuild/${EB_VERSION} &> ${ml_av_easybuild_out}
     if [[ $? -eq 0 ]]; then
         echo_green ">> Module for EasyBuild v${EB_VERSION} found!"
     else
-        eb_ec=EasyBuild-${EB_VERSION}.eb
-        echo_yellow ">> Still no module for EasyBuild v${EB_VERSION}, trying with easyconfig ${eb_ec}..."
-        ${EB} --search ${eb_ec} | grep ${eb_ec} > /dev/null
+        module --ignore_cache avail 2>&1 | grep -i easybuild/${EB_VERSION} &> ${ml_av_easybuild_out}
         if [[ $? -eq 0 ]]; then
-            echo "Easyconfig ${eb_ec} found for EasyBuild v${EB_VERSION}, so installing it..."
-            ok_msg="EasyBuild v${EB_VERSION} installed, alright!"
-            fail_msg="Installing EasyBuild v${EB_VERSION}, yikes! (output: ${eb_install_out})"
-            ${EB} EasyBuild-${EB_VERSION}.eb 2>&1 | tee -a ${eb_install_out}
-            check_exit_code $? "${ok_msg}" "${fail_msg}"
+            echo_green ">> Module for EasyBuild v${EB_VERSION} found!"
+            IGNORE_CACHE='--ignore_cache'
         else
-            fatal_error "No easyconfig found for EasyBuild v${EB_VERSION}"
+            eb_ec=EasyBuild-${EB_VERSION}.eb
+            echo_yellow ">> Still no module for EasyBuild v${EB_VERSION}, trying with easyconfig ${eb_ec}..."
+            ${EB} --search ${eb_ec} | grep ${eb_ec} > /dev/null
+            if [[ $? -eq 0 ]]; then
+                echo "Easyconfig ${eb_ec} found for EasyBuild v${EB_VERSION}, so installing it..."
+                ok_msg="EasyBuild v${EB_VERSION} installed, alright!"
+                fail_msg="Installing EasyBuild v${EB_VERSION}, yikes! (output: ${eb_install_out})"
+                ${EB} EasyBuild-${EB_VERSION}.eb 2>&1 | tee -a ${eb_install_out}
+                check_exit_code $? "${ok_msg}" "${fail_msg}"
+            else
+                fatal_error "No easyconfig found for EasyBuild v${EB_VERSION}"
+            fi
         fi
     fi
 
@@ -103,7 +110,7 @@ else
 fi
 
 echo ">> Loading EasyBuild v${EB_VERSION} module..."
-module load EasyBuild/${EB_VERSION}
+module ${IGNORE_CACHE} load EasyBuild/${EB_VERSION}
 eb_show_system_info_out=${TMPDIR}/eb_show_system_info.out
 ${EB} --show-system-info > ${eb_show_system_info_out}
 if [[ $? -eq 0 ]]; then

From c1b29b3d3384c0a3a570252703d274537437e75c Mon Sep 17 00:00:00 2001
From: Tim Kok <tim.kok@surf.nl>
Date: Mon, 30 Oct 2023 18:09:34 +0100
Subject: [PATCH 2/2] Use correct 4.8.2 PR

---
 eessi-2023.06-eb-4.8.1-system.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eessi-2023.06-eb-4.8.1-system.yml b/eessi-2023.06-eb-4.8.1-system.yml
index 3d0e1c3c32..b0731d2534 100644
--- a/eessi-2023.06-eb-4.8.1-system.yml
+++ b/eessi-2023.06-eb-4.8.1-system.yml
@@ -6,4 +6,4 @@ easyconfigs:
         from-pr: 18851
   - EasyBuild-4.8.2.eb:
       options:
-        from-pr: 19101
+        from-pr: 19105