From 846098a7998656f17e420ddb7c5b305abc0c91f8 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Tue, 23 Apr 2024 10:52:43 +0200 Subject: [PATCH] Remove contbuild constraint Signed-off-by: Theofilos Manitaras --- checks/containers/buildah/buildah_check.py | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/checks/containers/buildah/buildah_check.py b/checks/containers/buildah/buildah_check.py index 81d5a62a7..5810dd0f7 100644 --- a/checks/containers/buildah/buildah_check.py +++ b/checks/containers/buildah/buildah_check.py @@ -23,18 +23,13 @@ class BuildahTestBase(rfm.RunOnlyRegressionTest): @run_after('setup') def setup_buildah(self): self.archive_name = self.image_tag.split(':')[0] - if self.current_system.name not in {'dom', 'daint'}: - self.graphroot = '/dev/shm/$USER/buildah_root' - self.runroot = '/dev/shm/$USER/buildah_runroot' - self.env_vars = {'XDG_DATA_HOME': '/dev/shm/$USER/xdg_data_home'} - self.prerun_cmds = ['unset XDG_RUNTIME_DIR'] + self.prerun_cmds - else: + self.graphroot = '/dev/shm/$USER/buildah_root' + self.runroot = '/dev/shm/$USER/buildah_runroot' + self.env_vars = {'XDG_DATA_HOME': '/dev/shm/$USER/xdg_data_home'} + self.prerun_cmds = ['unset XDG_RUNTIME_DIR'] + self.prerun_cmds + + if self.current_system.name in {'dom', 'daint'}: self.modules = ['Buildah'] - self.graphroot = '/scratch/local/$USER/buildah_root' - self.runroot = '/scratch/local/$USER/buildah_runroot' - self.env_vars = { - 'XDG_DATA_HOME': '/scratch/local/$USER/xdg_data_home' - } self.prerun_cmds += [ f'rm -f {self.runroot}/{self.archive_name}.tar', @@ -63,8 +58,6 @@ def set_postrun_cmds(self): def set_job_options(self): self.job.launcher = getlauncher('local')() self.job.options += ['--nodes=1'] - if self.current_system.name in {'dom', 'daint'}: - self.job.options += ['--constraint=contbuild'] @sanity_function def assert_committed_image(self):