Allow there to be an environment variable per EESSI version for site top-level toolchains

Author: ocaisa

.github/workflows/test-eb-hooks.yml

@@ -104,12 +104,12 @@ jobs:
               echo "Hook ignored via EESSI_OVERRIDE_TOOLCHAIN_CHECK with easyconfig $INCOMPATIBLE_EASYCONFIG and EESSI/${{matrix.EESSI_VERSION}}"
 
               # Now check if we can set a site list of supported toolchains
-              export EESSI_SITE_TOP_LEVEL_TOOLCHAINS='${{matrix.EESSI_SITE_TOP_LEVEL_TOOLCHAINS}}'
+              export EESSI_SITE_TOP_LEVEL_TOOLCHAINS_"${{matrix.EESSI_VERSION}}"='${{matrix.EESSI_SITE_TOP_LEVEL_TOOLCHAINS}}'
               eb --hooks=$PWD/eb_hooks.py "$INCOMPATIBLE_EASYCONFIG" --stop fetch
               echo "Site supported toolchain $EESSI_SITE_TOP_LEVEL_TOOLCHAINS successfully used with easyconfig $INCOMPATIBLE_EASYCONFIG and EESSI/${{matrix.EESSI_VERSION}}"
 
               # Make sure an invalid list of dicts fails
-              export EESSI_SITE_TOP_LEVEL_TOOLCHAINS="Not a list of dicts"
+              export EESSI_SITE_TOP_LEVEL_TOOLCHAINS_"${{matrix.EESSI_VERSION}}"="Not a list of dicts"
               eb --hooks=$PWD/eb_hooks.py "$INCOMPATIBLE_EASYCONFIG" --stop fetch 2>&1 1>/dev/null | grep -q "does not contain a valid list of dictionaries"
               echo "Incorrect format for EESSI_SITE_TOP_LEVEL_TOOLCHAINS caught"
 

eb_hooks.py

@@ -164,8 +164,9 @@ def parse_list_of_dicts_env(var_name):
 def verify_toolchains_supported_by_eessi_version(easyconfigs):
     """Each EESSI version supports a limited set of toolchains, sanity check the easyconfigs for toolchain support."""
     eessi_version = get_eessi_envvar('EESSI_VERSION')
-    supported_eessi_toolchains = parse_list_of_dicts_env('EESSI_SITE_TOP_LEVEL_TOOLCHAINS')
-    for top_level_toolchain in EESSI_SUPPORTED_TOP_LEVEL_TOOLCHAINS[eessi_version]:
+    supported_eessi_toolchains = []
+    site_top_level_toolchains = parse_list_of_dicts_env('EESSI_SITE_TOP_LEVEL_TOOLCHAINS_' + eessi_version)
+    for top_level_toolchain in EESSI_SUPPORTED_TOP_LEVEL_TOOLCHAINS[eessi_version] + site_top_level_toolchains:
         supported_eessi_toolchains += get_toolchain_hierarchy(top_level_toolchain)
     for ec in easyconfigs:
         toolchain = ec['ec']['toolchain']