From be617158baaf49576a6d57abb6b8f95d77e0e984 Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Sat, 6 Apr 2024 23:21:32 +0200
Subject: [PATCH 1/3] debug failing CI

---
 load_easybuild_module.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/load_easybuild_module.sh b/load_easybuild_module.sh
index d1bfd18bb5..cff703ce4b 100755
--- a/load_easybuild_module.sh
+++ b/load_easybuild_module.sh
@@ -68,6 +68,8 @@ else
     ok_msg="Latest EasyBuild release installed, let's go!"
     fail_msg="Installing latest EasyBuild release failed, that's not good... (output: ${eb_install_out})"
     ${EB} --install-latest-eb-release 2>&1 | tee ${eb_install_out}
+    ec=$?
+    cat $(${EB} --last-log)
     check_exit_code $? "${ok_msg}" "${fail_msg}"
 
     # maybe the module obtained with --install-latest-eb-release is exactly the EasyBuild version we wanted?

From 7eeef904d35275a44d698acb3e44c1a8f70733e8 Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Sat, 6 Apr 2024 23:51:55 +0200
Subject: [PATCH 2/3] more debug info

---
 .github/workflows/tests_scripts.yml |  2 +-
 load_easybuild_module.sh            | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests_scripts.yml b/.github/workflows/tests_scripts.yml
index d35e52f80f..db96eb3e4a 100644
--- a/.github/workflows/tests_scripts.yml
+++ b/.github/workflows/tests_scripts.yml
@@ -82,7 +82,7 @@ jobs:
           # run wrapper script + capture & check output
           out="${PWD}/eb-${EB_VERSION}.out"
           export EESSI_REPOS_CFG_DIR_OVERRIDE=${PWD}/repos
-          ./eessi_container.sh --access rw --mode run --verbose --repository nessi.no-2023.06-software /software-layer/run_in_compat_layer_env.sh /software-layer/eb-${EB_VERSION}.sh 2>&1 | tee ${out}
+          ./eessi_container.sh --access rw --mode run --verbose --repository EESSI /software-layer/run_in_compat_layer_env.sh /software-layer/eb-${EB_VERSION}.sh 2>&1 | tee ${out}
           pattern="^This is EasyBuild ${EB_VERSION} "
           grep "${pattern}" ${out} || (echo "Pattern '${pattern}' not found in output!" && exit 1)
         done
diff --git a/load_easybuild_module.sh b/load_easybuild_module.sh
index cff703ce4b..76ebcb62fd 100755
--- a/load_easybuild_module.sh
+++ b/load_easybuild_module.sh
@@ -64,12 +64,20 @@ else
     echo ">> Final installation in ${EASYBUILD_INSTALLPATH}..."
     export PATH=${EB_TMPDIR}/bin:${PATH}
     export PYTHONPATH=$(ls -d ${EB_TMPDIR}/lib/python*/site-packages):${PYTHONPATH}
+    echo "PATH=${PATH}"
+    echo "PYTHONPATH=${PYTHONPAATH}"
     eb_install_out=${TMPDIR}/eb_install.out
     ok_msg="Latest EasyBuild release installed, let's go!"
     fail_msg="Installing latest EasyBuild release failed, that's not good... (output: ${eb_install_out})"
+    which eb
+    ${EB} --version
     ${EB} --install-latest-eb-release 2>&1 | tee ${eb_install_out}
     ec=$?
+    echo "###############################"
+    cat ${eb_install_out}
+    echo "###############################"
     cat $(${EB} --last-log)
+    echo "###############################"
     check_exit_code $? "${ok_msg}" "${fail_msg}"
 
     # maybe the module obtained with --install-latest-eb-release is exactly the EasyBuild version we wanted?
@@ -85,6 +93,8 @@ else
         else
             eb_ec=EasyBuild-${EB_VERSION}.eb
             echo_yellow ">> Still no module for EasyBuild v${EB_VERSION}, trying with easyconfig ${eb_ec}..."
+            which eb
+            ${EB} --version
             ${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..."

From 6775606611e0f28df09508baf3c0888bb568f08c Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Sat, 6 Apr 2024 23:55:17 +0200
Subject: [PATCH 3/3] use NESSI repo

---
 .github/workflows/tests_scripts.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests_scripts.yml b/.github/workflows/tests_scripts.yml
index db96eb3e4a..d35e52f80f 100644
--- a/.github/workflows/tests_scripts.yml
+++ b/.github/workflows/tests_scripts.yml
@@ -82,7 +82,7 @@ jobs:
           # run wrapper script + capture & check output
           out="${PWD}/eb-${EB_VERSION}.out"
           export EESSI_REPOS_CFG_DIR_OVERRIDE=${PWD}/repos
-          ./eessi_container.sh --access rw --mode run --verbose --repository EESSI /software-layer/run_in_compat_layer_env.sh /software-layer/eb-${EB_VERSION}.sh 2>&1 | tee ${out}
+          ./eessi_container.sh --access rw --mode run --verbose --repository nessi.no-2023.06-software /software-layer/run_in_compat_layer_env.sh /software-layer/eb-${EB_VERSION}.sh 2>&1 | tee ${out}
           pattern="^This is EasyBuild ${EB_VERSION} "
           grep "${pattern}" ${out} || (echo "Pattern '${pattern}' not found in output!" && exit 1)
         done