Merge pull request #201 from bedroge/fix_reframe_tests_riscv

Fix ReFrame test step for RISC-V
EESSI · Mar 8, 2024 · 79b3b5d · 79b3b5d
2 parents 330ab0d + 941ce7e
commit 79b3b5d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/Dockerfile.bootstrap-prefix-debian-sid b/Dockerfile.bootstrap-prefix-debian-sid
@@ -4,7 +4,7 @@ FROM debian:sid-20240211-slim
 COPY bootstrap-prefix.sh /usr/local/bin/bootstrap-prefix.sh
 
 RUN apt-get update
-RUN apt-get install -y gcc g++ make diffutils libgmp-dev perl wget
+RUN apt-get install -y gcc g++ make diffutils libgmp-dev perl wget rustc
 RUN apt-get install -y git python3-pip python3-cryptography python3-venv
 RUN python3 -m venv --system-site-packages /opt/ansible && \
     . /opt/ansible/bin/activate && \

diff --git a/ansible/playbooks/roles/compatibility_layer/tasks/test.yml b/ansible/playbooks/roles/compatibility_layer/tasks/test.yml
@@ -17,6 +17,8 @@
     virtualenv_command: python3 -m venv
     state: forcereinstall
   when: reframe_exists.rc != 0
+  tags:
+    - test
 
 - name: Copy ReFrame test file
   ansible.builtin.copy:
@@ -30,6 +32,7 @@
   ansible.builtin.command:
     cmd: "{{ reframe_venv_dir + '/bin/' if reframe_exists.rc != 0 else '' }}reframe -r -v -c {{ reframe_venv_dir }}/compat_layer.py"
   environment:
+    EESSI_REPO_DIR: "/cvmfs/{{ cvmfs_repository }}"
     EESSI_VERSION: "{{ eessi_version }}"
     EESSI_OS: "{{ eessi_host_os }}"
     EESSI_ARCH: "{{ eessi_host_arch }}"

diff --git a/test/compat_layer.py b/test/compat_layer.py
@@ -11,6 +11,9 @@ class RunInGentooPrefixTestError(rfm.core.exceptions.ReframeError):
 
 
 class RunInGentooPrefixTest(rfm.RunOnlyRegressionTest):
+    eessi_repo_dir = parameter(
+        os.environ.get('EESSI_REPO_DIR', EESSI_REPO_DIR)
+    )
     eessi_version = parameter(
         os.environ.get('EESSI_VERSION', 'latest').split(',')
     )
@@ -27,12 +30,12 @@ def __init__(self):
         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'))
+            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
+            self.eessi_repo_dir = eessi_repo_dir
         else:
-            self.eessi_repo_dir = os.path.join(EESSI_REPO_DIR, 'versions')
+            self.eessi_repo_dir = os.path.join(eessi_repo_dir, 'versions')
 
         self.compat_dir = os.path.join(
             self.eessi_repo_dir,
@@ -195,7 +198,7 @@ def __init__(self):
             sn.assert_found(f'\n/{self.symlink_to_host}\n', self.stdout),
         ])
 
-        
+
 @rfm.simple_test
 class GentooOverlayGitTest(RunInGentooPrefixTest):
     def __init__(self):
@@ -214,7 +217,7 @@ def __init__(self):
 
         self.sanity_patterns = sn.assert_found(gentoo_git_repo_info, self.stdout)
 
-        
+
 @rfm.simple_test
 class GlibcEnvFileTest(RunInGentooPrefixTest):
     def __init__(self):
@@ -226,7 +229,7 @@ def __init__(self):
         self.command = 'equery has --package glibc EXTRA_EMAKE'
 
         trusted_dir = os.path.join(
-            EESSI_REPO_DIR,
+            eessi_repo_dir,
             'host_injections',
             self.eessi_version,
             'compat',