Make CI clearer about how it checks overrides

Author: ocaisa

.github/workflows/scripts/verify_eessi_environment.py

@@ -44,10 +44,9 @@ def check_env_endswith(var1, var2):
             # EESSI_ACCEL_SUBDIR is what is detected by archdetect (or respects EESSI_ACCELERATOR_TARGET_OVERRIDE)
             check_env_equals("EESSI_ACCELERATOR_TARGET_OVERRIDE", "EESSI_ACCEL_SUBDIR")
             # special case is where EESSI_ACCELERATOR_TARGET_OVERRIDE may not match the final
-            # accelerator architecture chosen (in CI we deliberately choose a non-existent CUDA
-            # compute cabability for one case)
-            os.environ["EESSI_FINAL_CC"] = expected_eessi_accel_arch[:-1] + "0"
-            check_env_equals("EESSI_ACCELERATOR_TARGET", "EESSI_FINAL_CC")
+            # accelerator architecture chosen.
+            # In CI we set FINAL_ACCELERATOR_PATH_EXPECTED to allow us to compare against an expected value.
+            check_env_equals("EESSI_ACCELERATOR_TARGET", "FINAL_ACCELERATOR_PATH_EXPECTED")
         # verify the software paths that should exist
         check_env_endswith("EESSI_SOFTWARE_PATH", "EESSI_SOFTWARE_SUBDIR")
         check_env_endswith("EESSI_SITE_SOFTWARE_PATH", "EESSI_SOFTWARE_SUBDIR")

.github/workflows/tests_eessi_module.yml

@@ -74,8 +74,9 @@ jobs:
           - x86_64/amd/zen4
         EESSI_ACCELERATOR_TARGET_OVERRIDE:
           - accel/nvidia/cc80
-          # This should fall back to cc70
+          # This should fall back to cc70 but that is checked later (in this step we just check for consistency)
           - accel/nvidia/cc77
+
     steps:
       - name: Check out software-layer repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -160,8 +161,14 @@ jobs:
         EESSI_ACCELERATOR_TARGET_OVERRIDE:
           - none
           - accel/nvidia/cc80
-          # This should fall back to cc70
           - accel/nvidia/cc77
+        include:
+          # For each override we expect a specific path (which may differ from the original due to overrides)
+        - EESSI_ACCELERATOR_TARGET_OVERRIDE: accel/nvidia/cc80
+          FINAL_ACCELERATOR_PATH_EXPECTED: accel/nvidia/cc80
+        - EESSI_ACCELERATOR_TARGET_OVERRIDE: accel/nvidia/cc77  # deliberately chose a non-existent CUDA capability
+          FINAL_ACCELERATOR_PATH_EXPECTED: accel/nvidia/cc70  # this reverts to the fallback case (which does exist)
+
     steps:
       - name: Check out software-layer repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1