Skip to content

Commit

Permalink
Merge pull request #189 from eth-cscs/fix/buildah_contbuild
Browse files Browse the repository at this point in the history
[bugfix] Remove contbuild constraint
  • Loading branch information
teojgo authored Apr 24, 2024
2 parents 5c403b5 + 846098a commit dea38f6
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions checks/containers/buildah/buildah_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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):
Expand Down

0 comments on commit dea38f6

Please sign in to comment.