Skip to content

Commit

Permalink
improves pipelines
Browse files Browse the repository at this point in the history
Signed-off-by: Andrey Kononykhin <[email protected]>
  • Loading branch information
andkononykhin committed May 22, 2019
1 parent c1ba0ce commit 9692747
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion Jenkinsfile.cd
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ def systemTests = { component, releaseVersion ->
docker exec -t --user indy indyclient bash -c "\
set -o pipefail; \
cd /home/indy/system_tests/system && mkdir reports && \
pytest -v --junit-xml=./reports/$testReportFileNameXml ./indy-node-tests/${testFileName} 2>&1 | \
pytest -l -v --junit-xml=./reports/$testReportFileNameXml ./indy-node-tests/${testFileName} 2>&1 | \
tee ./reports/$testReportFileNamePlain"
"""
}
Expand All @@ -222,6 +222,7 @@ def systemTests = { component, releaseVersion ->
sh "docker cp indyclient:/home/indy/system_tests/system/reports/ ./system_tests"

dir("system_tests/reports"){
sh "ls -la *report* || true"
if (err) {
archiveArtifacts artifacts: testReportFileNamePlain, allowEmptyArchive: true
}
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ def test(options=[:]) {

try {
if (options.useRunner) {
sh "PYTHONASYNCIODEBUG='0' $options.python runner.py --pytest \"$options.python -m pytest -v\" --dir $options.testDir --output \"$options.resFile\" --test-only-slice \"$options.testOnlySlice\""
sh "PYTHONASYNCIODEBUG='0' $options.python runner.py --pytest \"$options.python -m pytest -l -v\" --dir $options.testDir --output \"$options.resFile\" --test-only-slice \"$options.testOnlySlice\""
} else {
sh "$options.python -m pytest -v --junitxml=$options.resFile $options.testDir"
sh "$options.python -m pytest -l -v --junitxml=$options.resFile $options.testDir"
}
}
finally {
Expand Down

0 comments on commit 9692747

Please sign in to comment.