Skip to content

Commit 355504c

Browse files
ekoutsekouts
authored
Update modes (#500)
1 parent 29020b0 commit 355504c

File tree

5 files changed

+50
-105
lines changed

5 files changed

+50
-105
lines changed

‎config/common.py‎

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,16 @@ def _format_httpjson(record, extras, ignore_keys):
3131
return json.dumps(data)
3232

3333

34+
reframe_dir = os.getenv(
35+
'REFRAME_DIR',
36+
'/capstor/store/cscs/cscs/public/reframe/reframe-stable/$CLUSTER_NAME'
37+
)
38+
target_dir_var_exists = bool(os.getenv('TARGET_DIR'))
39+
target_dir_base = (
40+
'$SCRATCH/reframe/$CLUSTER_NAME' if not target_dir_var_exists else ''
41+
)
42+
43+
3444
site_configuration = {
3545
'environments': [
3646
{
@@ -108,30 +118,38 @@ def _format_httpjson(record, extras, ignore_keys):
108118
{
109119
'name': 'maintenance',
110120
'options': [
111-
'--unload-module=reframe',
112121
'-Sstrict_check=1',
113-
'--output=$SCRATCH/regression/maintenance',
114-
'--perflogdir=$SCRATCH/regression/maintenance/logs',
115-
'--stage=$SCRATCH/regression/maintenance/stage',
116-
'--report-file=$SCRATCH/regression/maintenance/reports/maint_report_{sessionid}.json',
117-
'--save-log-files',
118-
'-p \'(?!PrgEnv-ce)\'',
122+
f'-c {reframe_dir}/cscs-reframe-tests.git/checks',
123+
'--failure-stats',
119124
'--tag=maintenance',
120-
'--timestamp=%F_%H-%M-%S',
125+
'-p \'(?!PrgEnv-ce)\'',
126+
f'--prefix={os.getenv("TARGET_DIR") if target_dir_var_exists else target_dir_base + "/maint"}', # noqa: E501
127+
f'--output={os.getenv("TARGET_DIR") if target_dir_var_exists else target_dir_base + "/maint"}', # noqa: E501
128+
'--timestamp=%F_%H-%M-%S'
121129
]
122130
},
123131
{
124132
'name': 'production',
125133
'options': [
126-
'--unload-module=reframe',
127134
'-Sstrict_check=1',
128-
'--output=$SCRATCH/regression/production',
129-
'--perflogdir=$SCRATCH/regression/production/logs',
130-
'--stage=$SCRATCH/regression/production/stage',
131-
'--report-file=$SCRATCH/regression/production/reports/prod_report_{sessionid}.json',
132-
'--save-log-files',
133-
'-p \'(?!PrgEnv-ce)\'',
135+
f'-c {reframe_dir}/cscs-reframe-tests.git/checks',
136+
'--failure-stats',
134137
'--tag=production',
138+
'-p \'(?!PrgEnv-ce)\'',
139+
f'--prefix={os.getenv("TARGET_DIR") if target_dir_var_exists else target_dir_base + "/prod"}', # noqa: E501
140+
f'--output={os.getenv("TARGET_DIR") if target_dir_var_exists else target_dir_base + "/prod"}', # noqa: E501
141+
'--timestamp=%F_%H-%M-%S'
142+
]
143+
},
144+
{
145+
'name': 'veto',
146+
'options': [
147+
'-Sstrict_check=1',
148+
f'-c {reframe_dir}/cscs-reframe-tests.git/checks/microbenchmarks/cpu_gpu/node_burn/node-burn-ce.py', # noqa: E501
149+
'-S nb_duration=300',
150+
'--distribute=all',
151+
f'--prefix={os.getenv("TARGET_DIR") if target_dir_var_exists else target_dir_base + "/veto"}', # noqa: E501
152+
f'--output={os.getenv("TARGET_DIR") if target_dir_var_exists else target_dir_base + "/veto"}', # noqa: E501
135153
'--timestamp=%F_%H-%M-%S'
136154
]
137155
},

‎config/systems/balfrin.py‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
'builtin',
3737
],
3838
'container_platforms': [
39-
{
39+
{
4040
'type': 'Sarus',
4141
},
4242
],
@@ -96,20 +96,4 @@
9696
]
9797
},
9898
],
99-
'modes': [
100-
{
101-
'name': 'production',
102-
'options': [
103-
'--unload-module=reframe',
104-
'--exec-policy=async',
105-
'-Sstrict_check=1',
106-
'--prefix=$SCRATCH/$USER/regression/production',
107-
'--report-file=$SCRATCH/$USER/regression/production/reports/prod_report_{sessionid}.json',
108-
'--save-log-files',
109-
'--tag=production',
110-
'--timestamp=%F_%H-%M-%S'
111-
],
112-
'target_systems': ['balfrin'],
113-
}
114-
]
11599
}

‎config/systems/eiger.py‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -97,19 +97,4 @@
9797
}
9898
},
9999
],
100-
'modes': [
101-
{
102-
'name': 'production',
103-
'options': [
104-
'--exec-policy=async',
105-
'-Sstrict_check=1',
106-
'--prefix=$SCRATCH/regression/production',
107-
'--report-file=$SCRATCH/regression/production/reports/prod_report_{sessionid}.json',
108-
'--save-log-files',
109-
'--tag=production',
110-
'--timestamp=%F_%H-%M-%S'
111-
],
112-
'target_systems': ['eiger'],
113-
},
114-
]
115100
}

‎config/systems/santis.py‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,5 @@
6060
},
6161
]
6262
},
63-
],
64-
'modes': [
65-
{
66-
'name': 'production',
67-
'options': [
68-
'--unload-module=reframe',
69-
'--exec-policy=async',
70-
'-Sstrict_check=1',
71-
'--prefix=$SCRATCH/regression/production',
72-
'--report-file=$SCRATCH/regression/production/reports/prod_report_{sessionid}.json',
73-
'--save-log-files',
74-
'--tag=production',
75-
'--timestamp=%F_%H-%M-%S'
76-
],
77-
'target_systems': ['santis'],
78-
}
7963
]
8064
}

‎config/systems/starlex.py‎

Lines changed: 16 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,16 @@
66
# ReFrame CSCS settings
77
#
88

9-
reframe_dir = '/capstor/store/cscs/cscs/public/reframe/reframe-stable/$CLUSTER_NAME'
9+
import os
10+
11+
reframe_dir = os.getenv(
12+
'REFRAME_DIR',
13+
'/capstor/store/cscs/cscs/public/reframe/reframe-stable/$CLUSTER_NAME'
14+
)
15+
target_dir_var_exists = bool(os.getenv('TARGET_DIR'))
16+
target_dir_base = (
17+
'$SCRATCH/reframe/$CLUSTER_NAME' if not target_dir_var_exists else ''
18+
)
1019

1120
site_configuration = {
1221
'systems': [
@@ -68,51 +77,16 @@
6877
{
6978
'name': 'production',
7079
'options': [
71-
f'-C {reframe_dir}/cscs-reframe-tests.git/config/cscs.py',
80+
'-Sstrict_check=1',
7281
f'-c {reframe_dir}/cscs-reframe-tests.git/checks/apps/quantumespresso',
7382
f'-c {reframe_dir}/cscs-reframe-tests.git/checks/apps/cp2k',
7483
f'-c {reframe_dir}/cscs-reframe-tests.git/checks/apps/namd',
75-
'--report-junit=report.xml',
76-
'--report-file=latest.json',
77-
'--tag=production',
78-
'--failure-stats',
79-
'--max-retries=2',
80-
'--prefix=/capstor/store/cscs/cscs/public/reframe/reframe-stable/$CLUSTER_NAME',
81-
'--timestamp=%F_%H-%M-%S',
82-
'-Sstrict_check=1',
83-
],
84-
'target_systems': ['starlex'],
85-
},
86-
{
87-
'name': 'maintenance',
88-
'options': [
89-
f'-C {reframe_dir}/cscs-reframe-tests.git/config/cscs.py',
90-
f'-c {reframe_dir}/cscs-reframe-tests.git/checks',
91-
'--report-junit=report.xml',
92-
'--report-file=latest.json',
93-
'--tag=maintenance',
9484
'--failure-stats',
95-
'--max-retries=2',
96-
'--prefix=/capstor/store/cscs/cscs/public/reframe/reframe-stable/$CLUSTER_NAME',
97-
'--timestamp=%F_%H-%M-%S',
98-
'-Sstrict_check=1',
99-
],
100-
'target_systems': ['starlex'],
101-
},
102-
{
103-
'name': 'veto',
104-
'options': [
105-
f'-C {reframe_dir}/cscs-reframe-tests.git/config/cscs.py',
106-
f'-c {reframe_dir}/cscs-reframe-tests.git/checks/microbenchmarks/cpu_gpu/node_burn/node-burn-ce.py',
107-
'--report-junit=report.xml',
108-
'--report-file=latest.json',
109-
'-S nb_duration=300',
110-
'--distribute=all',
111-
'--failure-stats',
112-
'--max-retries=2',
113-
'--prefix=/capstor/store/cscs/cscs/public/reframe/reframe-stable/$CLUSTER_NAME',
114-
'--timestamp=%F_%H-%M-%S',
115-
'-Sstrict_check=1',
85+
'--tag=production',
86+
'-p \'(?!PrgEnv-ce)\'',
87+
f'--prefix={os.getenv("TARGET_DIR") if target_dir_var_exists else target_dir_base + "/prod"}', # noqa: E501
88+
f'--output={os.getenv("TARGET_DIR") if target_dir_var_exists else target_dir_base + "/prod"}', # noqa: E501
89+
'--timestamp=%F_%H-%M-%S'
11690
],
11791
'target_systems': ['starlex'],
11892
}

0 commit comments

Comments
 (0)