From 2ea186d4c37a3f869b7c2273b9ed07d157151b1c Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Fri, 3 Oct 2025 16:04:45 +0200
Subject: [PATCH 1/9] Run a quick rebuild to test EESSI-extend and eb_hooks.py

---
 .../workflows/tests_eessi_extend_module.yml   | 53 ++++++++++---------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/tests_eessi_extend_module.yml b/.github/workflows/tests_eessi_extend_module.yml
index 17da4e6a..5bfd060f 100644
--- a/.github/workflows/tests_eessi_extend_module.yml
+++ b/.github/workflows/tests_eessi_extend_module.yml
@@ -10,11 +10,12 @@ jobs:
   basic_checks:
     runs-on: ubuntu-22.04
     strategy:
-      fail-fast: false
       matrix:
-        EESSI_VERSION:
-          - '2023.06'
-          #- '2025.06'
+        include:
+          - eessi_version: '2023.06'
+            rebuild_software: "BCFtools-1.18-GCC-12.3.0.eb"
+          - eessi_version: '2025.06'
+            rebuild_software: "make-4.4.1-GCCcore-13.3.0.eb"
     steps:
       - name: Check out software-layer repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -22,7 +23,7 @@ jobs:
       - name: Mount EESSI CernVM-FS repository
         uses: eessi/github-action-eessi@v3
         with:
-          eessi_stack_version: ${{matrix.EESSI_VERSION}}
+          eessi_stack_version: ${{matrix.eessi_version}}
           use_eessi_module: true
 
       - name: Install the EESSI-extend shipped with the repository
@@ -38,7 +39,7 @@ jobs:
           check_disallowed_env_prefix EASYBUILD_
 
           # Load the EESSI module
-          module load EESSI/${{matrix.EESSI_VERSION}}
+          module load EESSI/${{matrix.eessi_version}}
           check_disallowed_env_prefix EASYBUILD_
 
           # Load EasyBuild to install EESSI-extend
@@ -50,8 +51,12 @@ jobs:
 
           # Verify that we can pick the installed version up
           module use $MY_INSTALLATION_PATH/modules/all
-          module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild
+          module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           echo $EBROOTEESSIMINEXTEND | grep $MY_INSTALLATION_PATH || { echo "ERROR: Installed version of EESSI-extend not picked up (loaded $EBROOTEESSIMINEXTEND)" >&2; exit 1; }
+          # Do a test rebuild (with default and local hooks)
+          eb --rebuild ${{matrix.rebuild_software}}
+          eb --rebuild --hooks=./eb_hooks.py ${{matrix.rebuild_software}}
+          # Proceed with unload and checking that
           module unload EESSI-extend
           # That should have unset all EasyBuild envvars (including EASYBUILD_PREFIX)
           check_disallowed_env_prefix EASYBUILD_
@@ -68,19 +73,19 @@ jobs:
 
           # Let's start from a clean slate
           module purge
-          module load EESSI/${{matrix.EESSI_VERSION}}
+          module load EESSI/${{matrix.eessi_version}}
           # Access the installed EESSI-extend
           module use "$MY_INSTALLATION_PATH"/modules/all
           check_disallowed_env_prefix EASYBUILD_
 
           # Configure for CVMFS install
           export EESSI_CVMFS_INSTALL=1
-          module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild
+          module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           # check some common EasyBuild settings
           check_env_var "EASYBUILD_READ_ONLY_INSTALLDIR" "1"
           check_env_var "EASYBUILD_ALLOW_LOADED_MODULES" "EasyBuild,EESSI-extend"
           check_env_var "EASYBUILD_SYSROOT" "$EESSI_EPREFIX"
-          check_env_var "EASYBUILD_HOOKS" "/cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/init/easybuild/eb_hooks.py"
+          check_env_var "EASYBUILD_HOOKS" "/cvmfs/software.eessi.io/versions/${{matrix.eessi_version}}/init/easybuild/eb_hooks.py"
           check_env_var "EASYBUILD_RPATH" "1"
           check_env_var "EASYBUILD_FILTER_ENV_VARS" "LD_LIBRARY_PATH"
           # check some specific ones
@@ -92,7 +97,7 @@ jobs:
           check_env_var "EASYBUILD_FAIL_ON_MOD_FILES_GCCCORE" "1"
           check_env_var "EASYBUILD_LOCAL_VAR_NAMING_CHECK" "error"
           # Check some EESSI version specific settings
-          if [[ "${{ matrix.EESSI_VERSION }}" != "2023.06" ]]; then
+          if [[ "${{ matrix.eessi_version }}" != "2023.06" ]]; then
             check_env_var "EASYBUILD_PREFER_PYTHON_SEARCH_PATH" "EBPYTHONPREFIXES"
             check_env_var "EASYBUILD_MODULE_SEARCH_PATH_HEADERS" "include_paths"
             check_env_var "EASYBUILD_SEARCH_PATH_CPP_HEADERS" "include_paths"
@@ -106,7 +111,7 @@ jobs:
 
           # Now configure for a site
           export EESSI_SITE_INSTALL=1
-          module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild
+          module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           # check some specific envvars
           check_env_var "EASYBUILD_INSTALLPATH" "$EESSI_SITE_SOFTWARE_PATH"
           check_env_var "EASYBUILD_UMASK" "022"
@@ -119,7 +124,7 @@ jobs:
 
           # Now for a project
           export EESSI_PROJECT_INSTALL="$MY_INSTALLATION_PATH"
-          module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild
+          module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           # check some specific envvars
           export EXPECTED_INSTALLATION_PATH="$MY_INSTALLATION_PATH/versions/$EESSI_VERSION/software/linux/$EESSI_SOFTWARE_SUBDIR"
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"
@@ -135,7 +140,7 @@ jobs:
           # Now for a user
           export EESSI_USER_INSTALL="$MY_INSTALLATION_PATH/$USER"
           mkdir -p $EESSI_USER_INSTALL  # must exist
-          module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild
+          module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           # check some specific envvars
           export EXPECTED_INSTALLATION_PATH="$MY_INSTALLATION_PATH/$USER/versions/$EESSI_VERSION/software/linux/$EESSI_SOFTWARE_SUBDIR"
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"
@@ -163,18 +168,18 @@ jobs:
           # Let's start from a clean slate
           module purge
           export EESSI_ACCELERATOR_TARGET_OVERRIDE=$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE
-          module load EESSI/${{matrix.EESSI_VERSION}}
+          module load EESSI/${{matrix.eessi_version}}
           # Access the installed EESSI-extend
           module use "$MY_INSTALLATION_PATH"/modules/all
           check_disallowed_env_prefix EASYBUILD_
 
           # Configure for CVMFS install
           export EESSI_CVMFS_INSTALL=1
-          module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild
+          module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EESSI_SOFTWARE_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
           check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           export EESSI_ACCELERATOR_INSTALL=1
-          module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild # reload for an actual GPU installation
+          module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation
           check_env_var "EASYBUILD_INSTALLPATH" "${EESSI_SOFTWARE_PATH}/${EESSI_ACCELERATOR_TARGET_OVERRIDE}"
           # unload and make sure the environment is clean again
           module unload EESSI-extend
@@ -184,11 +189,11 @@ jobs:
 
           # Now configure for a site
           export EESSI_SITE_INSTALL=1
-          module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild
+          module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EESSI_SITE_SOFTWARE_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
           check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           export EESSI_ACCELERATOR_INSTALL=1
-          module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild # reload for an actual GPU installation
+          module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation
           check_env_var "EASYBUILD_INSTALLPATH" "${EESSI_SITE_SOFTWARE_PATH}/${EESSI_ACCELERATOR_TARGET_OVERRIDE}"
           # unload and make sure the environment is clean again
           module unload EESSI-extend
@@ -199,11 +204,11 @@ jobs:
           # Now for a project
           export EESSI_PROJECT_INSTALL="$MY_INSTALLATION_PATH"
           export EXPECTED_INSTALLATION_PATH="$MY_INSTALLATION_PATH/versions/$EESSI_VERSION/software/linux/$EESSI_SOFTWARE_SUBDIR"
-          module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild
+          module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
           check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           export EESSI_ACCELERATOR_INSTALL=1
-          module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild # reload for an GPU actual installation
+          module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an GPU actual installation
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"  # installation path should be the same for project case
           # unload and make sure the environment is clean again
           module unload EESSI-extend
@@ -214,14 +219,14 @@ jobs:
           # Now for a user
           export EESSI_USER_INSTALL="$MY_INSTALLATION_PATH/$USER"
           mkdir -p $EESSI_USER_INSTALL  # must exist
-          module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild
+          module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           # check some specific envvars
           export EXPECTED_INSTALLATION_PATH="$MY_INSTALLATION_PATH/$USER/versions/$EESSI_VERSION/software/linux/$EESSI_SOFTWARE_SUBDIR"
-          module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild
+          module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
           check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           export EESSI_ACCELERATOR_INSTALL=1
-          module load EESSI-extend/${{matrix.EESSI_VERSION}}-easybuild # reload for an actual GPU installation
+          module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"  # installation path should be the same for user case
           # unload and make sure the environment is clean again
           module unload EESSI-extend

From 5b274fb0c38df9689a0b9b56e3f85040ee7f5936 Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Mon, 6 Oct 2025 09:27:09 +0200
Subject: [PATCH 2/9] Make sure we check the EB CUDA settings for all cases

---
 .github/workflows/tests_eessi_extend_module.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests_eessi_extend_module.yml b/.github/workflows/tests_eessi_extend_module.yml
index 5bfd060f..4830ea1a 100644
--- a/.github/workflows/tests_eessi_extend_module.yml
+++ b/.github/workflows/tests_eessi_extend_module.yml
@@ -177,10 +177,11 @@ jobs:
           export EESSI_CVMFS_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EESSI_SOFTWARE_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
-          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
+          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" ""
           export EESSI_ACCELERATOR_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation
           check_env_var "EASYBUILD_INSTALLPATH" "${EESSI_SOFTWARE_PATH}/${EESSI_ACCELERATOR_TARGET_OVERRIDE}"
+          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           # unload and make sure the environment is clean again
           module unload EESSI-extend
           check_disallowed_env_prefix EASYBUILD_
@@ -191,10 +192,11 @@ jobs:
           export EESSI_SITE_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EESSI_SITE_SOFTWARE_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
-          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
+          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" ""
           export EESSI_ACCELERATOR_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation
           check_env_var "EASYBUILD_INSTALLPATH" "${EESSI_SITE_SOFTWARE_PATH}/${EESSI_ACCELERATOR_TARGET_OVERRIDE}"
+          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           # unload and make sure the environment is clean again
           module unload EESSI-extend
           check_disallowed_env_prefix EASYBUILD_
@@ -206,10 +208,11 @@ jobs:
           export EXPECTED_INSTALLATION_PATH="$MY_INSTALLATION_PATH/versions/$EESSI_VERSION/software/linux/$EESSI_SOFTWARE_SUBDIR"
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
-          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
+          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" ""
           export EESSI_ACCELERATOR_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an GPU actual installation
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"  # installation path should be the same for project case
+          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           # unload and make sure the environment is clean again
           module unload EESSI-extend
           check_disallowed_env_prefix EASYBUILD_
@@ -224,10 +227,11 @@ jobs:
           export EXPECTED_INSTALLATION_PATH="$MY_INSTALLATION_PATH/$USER/versions/$EESSI_VERSION/software/linux/$EESSI_SOFTWARE_SUBDIR"
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
-          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
+          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" ""
           export EESSI_ACCELERATOR_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"  # installation path should be the same for user case
+          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           # unload and make sure the environment is clean again
           module unload EESSI-extend
           check_disallowed_env_prefix EASYBUILD_

From 9d9453964cf49218054250eae930b041a703c9e1 Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Mon, 6 Oct 2025 09:41:03 +0200
Subject: [PATCH 3/9] Add some debug echo

---
 .github/workflows/tests_eessi_extend_module.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests_eessi_extend_module.yml b/.github/workflows/tests_eessi_extend_module.yml
index 4830ea1a..3ed56cc7 100644
--- a/.github/workflows/tests_eessi_extend_module.yml
+++ b/.github/workflows/tests_eessi_extend_module.yml
@@ -79,6 +79,7 @@ jobs:
           check_disallowed_env_prefix EASYBUILD_
 
           # Configure for CVMFS install
+          echo "Checking EESSI-extend CVMFS install"
           export EESSI_CVMFS_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           # check some common EasyBuild settings
@@ -110,6 +111,7 @@ jobs:
           unset EESSI_CVMFS_INSTALL
 
           # Now configure for a site
+          echo "Checking EESSI-extend site install"
           export EESSI_SITE_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           # check some specific envvars
@@ -123,6 +125,7 @@ jobs:
           unset EESSI_SITE_INSTALL
 
           # Now for a project
+          echo "Checking EESSI-extend project install"
           export EESSI_PROJECT_INSTALL="$MY_INSTALLATION_PATH"
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           # check some specific envvars
@@ -138,6 +141,7 @@ jobs:
           unset EESSI_PROJECT_INSTALL
 
           # Now for a user
+          echo "Checking EESSI-extend user install"
           export EESSI_USER_INSTALL="$MY_INSTALLATION_PATH/$USER"
           mkdir -p $EESSI_USER_INSTALL  # must exist
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
@@ -174,10 +178,12 @@ jobs:
           check_disallowed_env_prefix EASYBUILD_
 
           # Configure for CVMFS install
+          echo "Checking EESSI-extend CVMFS install"
           export EESSI_CVMFS_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EESSI_SOFTWARE_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
-          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" ""
+          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
+          module unload EESSI-extend
           export EESSI_ACCELERATOR_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation
           check_env_var "EASYBUILD_INSTALLPATH" "${EESSI_SOFTWARE_PATH}/${EESSI_ACCELERATOR_TARGET_OVERRIDE}"
@@ -189,10 +195,12 @@ jobs:
           unset EESSI_CVMFS_INSTALL
 
           # Now configure for a site
+          echo "Checking EESSI-extend site install"
           export EESSI_SITE_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EESSI_SITE_SOFTWARE_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
           check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" ""
+          module unload EESSI-extend
           export EESSI_ACCELERATOR_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation
           check_env_var "EASYBUILD_INSTALLPATH" "${EESSI_SITE_SOFTWARE_PATH}/${EESSI_ACCELERATOR_TARGET_OVERRIDE}"
@@ -204,11 +212,13 @@ jobs:
           unset EESSI_SITE_INSTALL
 
           # Now for a project
+          echo "Checking EESSI-extend project install"
           export EESSI_PROJECT_INSTALL="$MY_INSTALLATION_PATH"
           export EXPECTED_INSTALLATION_PATH="$MY_INSTALLATION_PATH/versions/$EESSI_VERSION/software/linux/$EESSI_SOFTWARE_SUBDIR"
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
           check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" ""
+          module unload EESSI-extend
           export EESSI_ACCELERATOR_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an GPU actual installation
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"  # installation path should be the same for project case
@@ -220,6 +230,7 @@ jobs:
           unset EESSI_PROJECT_INSTALL
 
           # Now for a user
+          echo "Checking EESSI-extend user install"
           export EESSI_USER_INSTALL="$MY_INSTALLATION_PATH/$USER"
           mkdir -p $EESSI_USER_INSTALL  # must exist
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
@@ -228,6 +239,7 @@ jobs:
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
           check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" ""
+          module unload EESSI-extend
           export EESSI_ACCELERATOR_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"  # installation path should be the same for user case

From b1b52033b14e6228f437f36277c67401d9282908 Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Mon, 6 Oct 2025 09:47:26 +0200
Subject: [PATCH 4/9] Tweak

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

diff --git a/.github/workflows/tests_eessi_extend_module.yml b/.github/workflows/tests_eessi_extend_module.yml
index 3ed56cc7..2808837b 100644
--- a/.github/workflows/tests_eessi_extend_module.yml
+++ b/.github/workflows/tests_eessi_extend_module.yml
@@ -182,7 +182,7 @@ jobs:
           export EESSI_CVMFS_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EESSI_SOFTWARE_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
-          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
+          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" ""
           module unload EESSI-extend
           export EESSI_ACCELERATOR_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation

From 0adaebddcb9955595057df8f54630ac6794205e0 Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Mon, 6 Oct 2025 10:00:53 +0200
Subject: [PATCH 5/9] Tweak

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

diff --git a/.github/workflows/tests_eessi_extend_module.yml b/.github/workflows/tests_eessi_extend_module.yml
index 2808837b..3ed56cc7 100644
--- a/.github/workflows/tests_eessi_extend_module.yml
+++ b/.github/workflows/tests_eessi_extend_module.yml
@@ -182,7 +182,7 @@ jobs:
           export EESSI_CVMFS_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EESSI_SOFTWARE_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
-          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" ""
+          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           module unload EESSI-extend
           export EESSI_ACCELERATOR_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation

From 4218a7ac2f96d323011dbedab3ee3fd6934e3b33 Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Mon, 6 Oct 2025 10:19:14 +0200
Subject: [PATCH 6/9] Tweak

---
 .github/workflows/tests_eessi_extend_module.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests_eessi_extend_module.yml b/.github/workflows/tests_eessi_extend_module.yml
index 3ed56cc7..4e726db1 100644
--- a/.github/workflows/tests_eessi_extend_module.yml
+++ b/.github/workflows/tests_eessi_extend_module.yml
@@ -199,7 +199,7 @@ jobs:
           export EESSI_SITE_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EESSI_SITE_SOFTWARE_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
-          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" ""
+          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           module unload EESSI-extend
           export EESSI_ACCELERATOR_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation
@@ -217,7 +217,7 @@ jobs:
           export EXPECTED_INSTALLATION_PATH="$MY_INSTALLATION_PATH/versions/$EESSI_VERSION/software/linux/$EESSI_SOFTWARE_SUBDIR"
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
-          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" ""
+          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           module unload EESSI-extend
           export EESSI_ACCELERATOR_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an GPU actual installation
@@ -238,7 +238,7 @@ jobs:
           export EXPECTED_INSTALLATION_PATH="$MY_INSTALLATION_PATH/$USER/versions/$EESSI_VERSION/software/linux/$EESSI_SOFTWARE_SUBDIR"
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
-          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" ""
+          check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           module unload EESSI-extend
           export EESSI_ACCELERATOR_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation

From 90138731636fe9cde37d0bf524726eba8fa62f91 Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Mon, 6 Oct 2025 10:28:40 +0200
Subject: [PATCH 7/9] Add some more verbose checks

---
 .github/workflows/tests_eessi_extend_module.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/tests_eessi_extend_module.yml b/.github/workflows/tests_eessi_extend_module.yml
index 4e726db1..52481325 100644
--- a/.github/workflows/tests_eessi_extend_module.yml
+++ b/.github/workflows/tests_eessi_extend_module.yml
@@ -182,11 +182,13 @@ jobs:
           export EESSI_CVMFS_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EESSI_SOFTWARE_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
+          check_env_var "EESSI_ACCELERATOR_TARGET" "$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE"
           check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           module unload EESSI-extend
           export EESSI_ACCELERATOR_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation
           check_env_var "EASYBUILD_INSTALLPATH" "${EESSI_SOFTWARE_PATH}/${EESSI_ACCELERATOR_TARGET_OVERRIDE}"
+          check_env_var "EESSI_ACCELERATOR_TARGET" "$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE"
           check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           # unload and make sure the environment is clean again
           module unload EESSI-extend
@@ -199,11 +201,13 @@ jobs:
           export EESSI_SITE_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EESSI_SITE_SOFTWARE_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
+          check_env_var "EESSI_ACCELERATOR_TARGET" "$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE"
           check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           module unload EESSI-extend
           export EESSI_ACCELERATOR_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation
           check_env_var "EASYBUILD_INSTALLPATH" "${EESSI_SITE_SOFTWARE_PATH}/${EESSI_ACCELERATOR_TARGET_OVERRIDE}"
+          check_env_var "EESSI_ACCELERATOR_TARGET" "$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE"
           check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           # unload and make sure the environment is clean again
           module unload EESSI-extend
@@ -217,11 +221,13 @@ jobs:
           export EXPECTED_INSTALLATION_PATH="$MY_INSTALLATION_PATH/versions/$EESSI_VERSION/software/linux/$EESSI_SOFTWARE_SUBDIR"
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
+          check_env_var "EESSI_ACCELERATOR_TARGET" "$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE"
           check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           module unload EESSI-extend
           export EESSI_ACCELERATOR_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an GPU actual installation
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"  # installation path should be the same for project case
+          check_env_var "EESSI_ACCELERATOR_TARGET" "$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE"
           check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           # unload and make sure the environment is clean again
           module unload EESSI-extend
@@ -238,11 +244,13 @@ jobs:
           export EXPECTED_INSTALLATION_PATH="$MY_INSTALLATION_PATH/$USER/versions/$EESSI_VERSION/software/linux/$EESSI_SOFTWARE_SUBDIR"
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"  # installation path should be the same unless we ask for an explicit GPU installation
+          check_env_var "EESSI_ACCELERATOR_TARGET" "$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE"
           check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           module unload EESSI-extend
           export EESSI_ACCELERATOR_INSTALL=1
           module load EESSI-extend/${{matrix.eessi_version}}-easybuild # reload for an actual GPU installation
           check_env_var "EASYBUILD_INSTALLPATH" "$EXPECTED_INSTALLATION_PATH"  # installation path should be the same for user case
+          check_env_var "EESSI_ACCELERATOR_TARGET" "$STORED_EESSI_ACCELERATOR_TARGET_OVERRIDE"
           check_env_var "EASYBUILD_CUDA_COMPUTE_CAPABILITIES" "$STORED_CUDA_CC"
           # unload and make sure the environment is clean again
           module unload EESSI-extend

From a2e83dbf4ea81dca6f780063b1d78405554e220a Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Mon, 6 Oct 2025 10:45:17 +0200
Subject: [PATCH 8/9] No accelerator installations available for 2025.06 yet

---
 .github/workflows/tests_eessi_extend_module.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests_eessi_extend_module.yml b/.github/workflows/tests_eessi_extend_module.yml
index 52481325..4bfc506c 100644
--- a/.github/workflows/tests_eessi_extend_module.yml
+++ b/.github/workflows/tests_eessi_extend_module.yml
@@ -14,8 +14,8 @@ jobs:
         include:
           - eessi_version: '2023.06'
             rebuild_software: "BCFtools-1.18-GCC-12.3.0.eb"
-          - eessi_version: '2025.06'
-            rebuild_software: "make-4.4.1-GCCcore-13.3.0.eb"
+          # - eessi_version: '2025.06'
+          #   rebuild_software: "make-4.4.1-GCCcore-13.3.0.eb"
     steps:
       - name: Check out software-layer repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

From b979755f21e7a18b48fea6e234ecbc59082c2bc4 Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Mon, 6 Oct 2025 10:59:13 +0200
Subject: [PATCH 9/9] Make sure it always run for each matrix entry

---
 .github/workflows/tests_eessi_extend_module.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tests_eessi_extend_module.yml b/.github/workflows/tests_eessi_extend_module.yml
index 4bfc506c..201ac4e1 100644
--- a/.github/workflows/tests_eessi_extend_module.yml
+++ b/.github/workflows/tests_eessi_extend_module.yml
@@ -10,6 +10,7 @@ jobs:
   basic_checks:
     runs-on: ubuntu-22.04
     strategy:
+      fail-fast: false
       matrix:
         include:
           - eessi_version: '2023.06'