Skip to content

[ci] Use colon separated path convenction in CI #1141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 27, 2020
Merged

[ci] Use colon separated path convenction in CI #1141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb8c735
Use colon separated path convenction in CI
Jan 27, 2020
f664203
Join paths by :
Jan 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,9 @@ stage('Unittest') {
script: """${loginBash}
echo \$SCRATCH""").trim()
def reframeDir = "${scratch}/${dirPrefix}-${machineName}-${uniqueID}"
def moduleDefinition = ''
if (machineName == 'leone') {
moduleDefinition = '''module() { eval `/usr/bin/modulecmd bash $*`; }
export -f module'''
}
dir(reframeDir) {
checkout scm
sh("""${loginBash}
${moduleDefinition}
bash ${reframeDir}/${bashScript} -f ${reframeDir} -i ''""")
}
}
Expand Down
14 changes: 4 additions & 10 deletions ci-scripts/ci-runner.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ checked_exec()

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

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

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

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

echo "===================="
echo "Modified user checks"
Expand Down