don't parametrize eessi_repo_dir, clean up pilot repo code

EESSI · Jun 24, 2024 · 759f652 · 759f652
1 parent 91d4364
commit 759f652
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/test/compat_layer.py b/test/compat_layer.py
@@ -11,9 +11,7 @@ class RunInGentooPrefixTestError(rfm.core.exceptions.ReframeError):
 
 
 class RunInGentooPrefixTest(rfm.RunOnlyRegressionTest):
-    eessi_repo_dir = parameter(
-        os.environ.get('EESSI_REPO_DIR', EESSI_REPO_DIR)
-    )
+    eessi_repo_dir = os.environ.get('EESSI_REPO_DIR', EESSI_REPO_DIR)
     eessi_version = parameter(
         os.environ.get('EESSI_VERSION', 'latest').split(',')
     )
@@ -28,17 +26,10 @@ def __init__(self):
 
         self.valid_systems = ['*']
         self.valid_prog_environs = ['*']
-        if self.eessi_version == 'latest':
-            # resolve the "latest" symlink to the actual version
-            self.eessi_version = os.readlink(os.path.join(eessi_repo_dir, 'latest'))
-        # 2021.06 did not have the 'versions' subdirectory yet
-        if self.eessi_version == '2021.06':
-            self.eessi_repo_dir = eessi_repo_dir
-        else:
-            self.eessi_repo_dir = os.path.join(eessi_repo_dir, 'versions')
 
         self.compat_dir = os.path.join(
             self.eessi_repo_dir,
+            'versions',
             self.eessi_version,
             'compat',
             self.eessi_os,
@@ -229,7 +220,7 @@ def __init__(self):
         self.command = 'equery has --package glibc EXTRA_EMAKE'
 
         trusted_dir = os.path.join(
-            eessi_repo_dir,
+            self.eessi_repo_dir,
             'host_injections',
             self.eessi_version,
             'compat',