Skip to content

Commit 4dc7d2e

Browse files
author
Vasileios Karakasis
authored
Merge pull request #1141 from teojgo/ci/colon_check_paths
[ci] Use colon separated path convenction in CI
2 parents 194db5d + f664203 commit 4dc7d2e

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

Jenkinsfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,9 @@ stage('Unittest') {
9292
script: """${loginBash}
9393
echo \$SCRATCH""").trim()
9494
def reframeDir = "${scratch}/${dirPrefix}-${machineName}-${uniqueID}"
95-
def moduleDefinition = ''
96-
if (machineName == 'leone') {
97-
moduleDefinition = '''module() { eval `/usr/bin/modulecmd bash $*`; }
98-
export -f module'''
99-
}
10095
dir(reframeDir) {
10196
checkout scm
10297
sh("""${loginBash}
103-
${moduleDefinition}
10498
bash ${reframeDir}/${bashScript} -f ${reframeDir} -i ''""")
10599
}
106100
}

ci-scripts/ci-runner.bash

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ checked_exec()
4141

4242
run_tutorial_checks()
4343
{
44-
cmd="./bin/reframe -C tutorial/config/settings.py --exec-policy=async \
44+
cmd="./bin/reframe -C tutorial/config/settings.py \
4545
--save-log-files -r -t tutorial $@"
4646
echo "Running tutorial checks with \`$cmd'"
4747
checked_exec $cmd
4848
}
4949

5050
run_user_checks()
5151
{
52-
cmd="./bin/reframe -C config/cscs.py --exec-policy=async --save-log-files \
52+
cmd="./bin/reframe -C config/cscs.py --save-log-files \
5353
-r --flex-alloc-nodes=2 -t production|benchmark $@"
5454
echo "Running user checks with \`$cmd'"
5555
checked_exec $cmd
@@ -160,10 +160,7 @@ elif [ $CI_TUTORIAL -eq 1 ]; then
160160
grep -e '^tutorial/(?!config/).*\.py') )
161161

162162
if [ ${#tutorialchecks[@]} -ne 0 ]; then
163-
tutorialchecks_path=""
164-
for check in ${tutorialchecks[@]}; do
165-
tutorialchecks_path="${tutorialchecks_path} -c ${check}"
166-
done
163+
tutorialchecks_path="-c $(IFS=: eval 'echo "${tutorialchecks[*]}"')"
167164

168165
echo "========================"
169166
echo "Modified tutorial checks"
@@ -197,10 +194,7 @@ else
197194
userchecks=( $(git diff origin/master...HEAD --name-only --oneline --no-merges | \
198195
grep -e '^cscs-checks/.*\.py') )
199196
if [ ${#userchecks[@]} -ne 0 ]; then
200-
userchecks_path=""
201-
for check in ${userchecks[@]}; do
202-
userchecks_path="${userchecks_path} -c ${check}"
203-
done
197+
userchecks_path="-c $(IFS=: eval 'echo "${userchecks[*]}"')"
204198

205199
echo "===================="
206200
echo "Modified user checks"

0 commit comments

Comments
 (0)