From 1cbd81c1de51b447214c206461a3027061af164c Mon Sep 17 00:00:00 2001 From: Luca Date: Tue, 24 Oct 2023 19:38:40 +0200 Subject: [PATCH 1/4] Fix IOR on Alps with capstor --- checks/system/io/ior_check.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/system/io/ior_check.py b/checks/system/io/ior_check.py index 470ee7f7f..7248c7b40 100644 --- a/checks/system/io/ior_check.py +++ b/checks/system/io/ior_check.py @@ -11,7 +11,7 @@ class IorCheck(rfm.RegressionTest): - base_dir = parameter(['/scratch/e1000', + base_dir = parameter(['/capstor/scratch/cscs', '/scratch/snx3000tds', '/scratch/snx3000', '/scratch/shared/fulen', @@ -32,7 +32,7 @@ def add_fs_tags(self): @run_after('init') def set_fs_information(self): self.fs = { - '/scratch/e1000': { + '/capstor/scratch/cscs': { 'valid_systems': ['eiger:mc', 'pilatus:mc'], 'eiger': { 'num_tasks': 10, From 27253dc96d7e598bf3c1d419231d62e13de12415 Mon Sep 17 00:00:00 2001 From: lucamar Date: Wed, 25 Oct 2023 11:04:37 +0200 Subject: [PATCH 2/4] Update checks/system/io/ior_check.py Co-authored-by: Theofilos Manitaras --- checks/system/io/ior_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/system/io/ior_check.py b/checks/system/io/ior_check.py index 7248c7b40..ac93e95e0 100644 --- a/checks/system/io/ior_check.py +++ b/checks/system/io/ior_check.py @@ -32,7 +32,7 @@ def add_fs_tags(self): @run_after('init') def set_fs_information(self): self.fs = { - '/capstor/scratch/cscs': { + ''${SCRATCH:-/captor/scratch/cscs}': { 'valid_systems': ['eiger:mc', 'pilatus:mc'], 'eiger': { 'num_tasks': 10, From 17cb39e049c404504f27c7d3c546c9d9a1731d0e Mon Sep 17 00:00:00 2001 From: lucamar Date: Wed, 25 Oct 2023 11:05:47 +0200 Subject: [PATCH 3/4] Update checks/system/io/ior_check.py Co-authored-by: Theofilos Manitaras --- checks/system/io/ior_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/system/io/ior_check.py b/checks/system/io/ior_check.py index ac93e95e0..d74e7e8d9 100644 --- a/checks/system/io/ior_check.py +++ b/checks/system/io/ior_check.py @@ -11,7 +11,7 @@ class IorCheck(rfm.RegressionTest): - base_dir = parameter(['/capstor/scratch/cscs', + base_dir = parameter(['${SCRATCH:-/captor/scratch/cscs}', '/scratch/snx3000tds', '/scratch/snx3000', '/scratch/shared/fulen', From 52794a33773699ae9b6f65ff235343df356fbf5b Mon Sep 17 00:00:00 2001 From: lucamar Date: Wed, 25 Oct 2023 11:06:15 +0200 Subject: [PATCH 4/4] Update ior_check.py Update Copyright statement to include 2023 --- checks/system/io/ior_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/system/io/ior_check.py b/checks/system/io/ior_check.py index d74e7e8d9..a9cf4b6be 100644 --- a/checks/system/io/ior_check.py +++ b/checks/system/io/ior_check.py @@ -1,4 +1,4 @@ -# Copyright 2016-2022 Swiss National Supercomputing Centre (CSCS/ETH Zurich) +# Copyright 2016-2023 Swiss National Supercomputing Centre (CSCS/ETH Zurich) # ReFrame Project Developers. See the top-level LICENSE file for details. # # SPDX-License-Identifier: BSD-3-Clause