Skip to content

Commit 34b6b6a

Browse files
committed
ci: Pass type as separate argument
Fixes behaviour broken by e36e5e2
1 parent e58c820 commit 34b6b6a

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def jobMatrix(String type, String sourcedir, List specs) {
117117
exec ${sourcedir}/tests/ci/slurm-create-jobscript.sh "${label}" "${container}" "${jobscript}" ${ctestcmd}
118118
""")
119119
dir(sourcedir) {
120-
sh "tests/ci/slurm-submit.sh \"FairRoot \${JOB_BASE_NAME} ${label}\" ${jobscript}"
120+
sh "tests/ci/slurm-submit.sh \"${type}\" \"FairRoot \${JOB_BASE_NAME} ${label}\" ${jobscript}"
121121
}
122122
}
123123

tests/ci/slurm-submit.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
#! /bin/bash
22

3-
if [ $# != 2 ]
3+
if [ $# != 3 ]
44
then
5-
echo "*** Please call like: $0 LABEL JOBSH"
5+
echo "*** Please call like: $0 TYPE LABEL JOBSH"
66
exit 1
77
fi
88

9-
label="$1"
10-
jobsh="$2"
9+
type="$1"
10+
label="$2"
11+
jobsh="$3"
1112

1213
if [ -z "$ALFACI_SLURM_CPUS" ]
1314
then
@@ -26,8 +27,8 @@ if [ -z "$ALFACI_SLURM_QUEUE" ]
2627
then
2728
ALFACI_SLURM_QUEUE=main
2829
fi
29-
case "${label}" in
30-
*check/*)
30+
case "${type}" in
31+
*check*)
3132
slurm_requested_features=localworkspace
3233
;;
3334
esac

0 commit comments

Comments
 (0)